From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org,
linux-cifs@vger.kernel.org, Amir Goldstein <amir73il@gmail.com>,
linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org,
linux-mm@kvack.org, linux-btrfs@vger.kernel.org,
linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com
Subject: [PATCH 15/25] vfs: plumb RFR_* remap flags through the vfs dedupe functions
Date: Fri, 12 Oct 2018 17:07:30 -0700 [thread overview]
Message-ID: <153938925037.8361.16126790489559826169.stgit@magnolia> (raw)
In-Reply-To: <153938912912.8361.13446310416406388958.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Plumb a remap_flags argument through the vfs_dedupe_file_range_one
functions so that dedupe can take advantage of it.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
---
fs/overlayfs/file.c | 3 ++-
fs/read_write.c | 9 ++++++---
include/linux/fs.h | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/fs/overlayfs/file.c b/fs/overlayfs/file.c
index e5cc17281d0b..8f7a162768f2 100644
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@ -467,7 +467,8 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in,
case OVL_DEDUPE:
ret = vfs_dedupe_file_range_one(real_in.file, pos_in,
- real_out.file, pos_out, len);
+ real_out.file, pos_out, len,
+ flags);
break;
}
revert_creds(old_cred);
diff --git a/fs/read_write.c b/fs/read_write.c
index 30076ed38091..81e0f969da59 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1999,10 +1999,12 @@ EXPORT_SYMBOL(vfs_dedupe_file_range_compare);
loff_t vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos,
struct file *dst_file, loff_t dst_pos,
- loff_t len)
+ loff_t len, unsigned int remap_flags)
{
loff_t ret;
+ WARN_ON_ONCE(remap_flags & ~(RFR_SAME_DATA));
+
ret = mnt_want_write_file(dst_file);
if (ret)
return ret;
@@ -2033,7 +2035,7 @@ loff_t vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos,
}
ret = dst_file->f_op->remap_file_range(src_file, src_pos, dst_file,
- dst_pos, len, RFR_SAME_DATA);
+ dst_pos, len, remap_flags | RFR_SAME_DATA);
out_drop_write:
mnt_drop_write_file(dst_file);
@@ -2101,7 +2103,8 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
}
deduped = vfs_dedupe_file_range_one(file, off, dst_file,
- info->dest_offset, len);
+ info->dest_offset, len,
+ 0);
if (deduped == -EBADE)
info->status = FILE_DEDUPE_RANGE_DIFFERS;
else if (deduped < 0)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 4acda4809027..d77b8d90d65e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1863,7 +1863,7 @@ extern int vfs_dedupe_file_range(struct file *file,
struct file_dedupe_range *same);
extern loff_t vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos,
struct file *dst_file, loff_t dst_pos,
- loff_t len);
+ loff_t len, unsigned int remap_flags);
struct super_operations {
next prev parent reply other threads:[~2018-10-13 0:07 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-13 0:05 [PATCH v4 00/25] fs: fixes for serious clone/dedupe problems Darrick J. Wong
2018-10-13 0:05 ` [PATCH 01/25] xfs: add a per-xfs trace_printk macro Darrick J. Wong
2018-10-13 0:05 ` [PATCH 02/25] vfs: vfs_clone_file_prep_inodes should return EINVAL for a clone from beyond EOF Darrick J. Wong
2018-10-13 0:06 ` [PATCH 03/25] vfs: check file ranges before cloning files Darrick J. Wong
2018-10-13 0:06 ` [PATCH 04/25] vfs: strengthen checking of file range inputs to generic_remap_checks Darrick J. Wong
2018-10-13 0:06 ` [PATCH 05/25] vfs: avoid problematic remapping requests into partial EOF block Darrick J. Wong
2018-10-14 17:11 ` Christoph Hellwig
2018-10-13 0:06 ` [PATCH 06/25] vfs: skip zero-length dedupe requests Darrick J. Wong
2018-10-13 0:06 ` [PATCH 07/25] vfs: combine the clone and dedupe into a single remap_file_range Darrick J. Wong
2018-10-14 17:19 ` Christoph Hellwig
2018-10-15 6:04 ` Amir Goldstein
2018-10-15 12:47 ` Christoph Hellwig
2018-10-15 12:54 ` Amir Goldstein
2018-10-15 17:13 ` Darrick J. Wong
2018-10-15 18:32 ` Christoph Hellwig
2018-10-15 13:18 ` Matthew Wilcox
2018-10-15 16:42 ` Darrick J. Wong
2018-10-13 0:06 ` [PATCH 08/25] vfs: rename vfs_clone_file_prep to be more descriptive Darrick J. Wong
2018-10-13 0:06 ` [PATCH 09/25] vfs: rename clone_verify_area to remap_verify_area Darrick J. Wong
2018-10-13 0:06 ` [PATCH 10/25] vfs: create generic_remap_file_range_touch to update inode metadata Darrick J. Wong
2018-10-14 17:21 ` Christoph Hellwig
2018-10-15 16:30 ` Darrick J. Wong
2018-10-15 18:19 ` Christoph Hellwig
2018-10-13 0:06 ` [PATCH 11/25] vfs: pass remap flags to generic_remap_file_range_prep Darrick J. Wong
2018-10-14 17:22 ` Christoph Hellwig
2018-10-14 17:37 ` Christoph Hellwig
2018-10-15 15:42 ` Darrick J. Wong
2018-10-13 0:07 ` [PATCH 12/25] vfs: pass remap flags to generic_remap_checks Darrick J. Wong
2018-10-13 0:07 ` [PATCH 13/25] vfs: make remap_file_range functions take and return bytes completed Darrick J. Wong
2018-10-13 0:07 ` [PATCH 14/25] vfs: plumb RFR_* remap flags through the vfs clone functions Darrick J. Wong
2018-10-13 0:07 ` Darrick J. Wong [this message]
2018-10-13 0:07 ` [PATCH 16/25] vfs: make remapping to source file eof more explicit Darrick J. Wong
2018-10-14 17:24 ` Christoph Hellwig
2018-10-15 15:32 ` Darrick J. Wong
2018-10-15 18:28 ` Christoph Hellwig
2018-10-13 0:07 ` [PATCH 17/25] vfs: enable remap callers that can handle short operations Darrick J. Wong
2018-10-13 0:07 ` [PATCH 18/25] vfs: hide file range comparison function Darrick J. Wong
2018-10-14 17:43 ` Christoph Hellwig
2018-10-13 0:07 ` [PATCH 19/25] vfs: implement opportunistic short dedupe Darrick J. Wong
2018-10-14 17:26 ` Christoph Hellwig
2018-10-13 0:08 ` [PATCH 20/25] ocfs2: truncate page cache for clone destination file before remapping Darrick J. Wong
2018-10-13 0:08 ` [PATCH 21/25] ocfs2: fix pagecache truncation prior to reflink Darrick J. Wong
2018-10-13 0:08 ` [PATCH 22/25] ocfs2: support partial clone range and dedupe range Darrick J. Wong
2018-10-14 17:41 ` Christoph Hellwig
2018-10-13 0:08 ` [PATCH 23/25] xfs: fix pagecache truncation prior to reflink Darrick J. Wong
2018-10-13 0:08 ` [PATCH 24/25] xfs: support returning partial reflink results Darrick J. Wong
2018-10-14 17:35 ` Christoph Hellwig
2018-10-14 23:05 ` Dave Chinner
2018-10-15 15:49 ` Darrick J. Wong
2018-10-13 0:08 ` [PATCH 25/25] xfs: remove redundant remap partial EOF block checks Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2018-10-11 4:12 [PATCH v3 00/25] fs: fixes for serious clone/dedupe problems Darrick J. Wong
2018-10-11 4:14 ` [PATCH 15/25] vfs: plumb RFR_* remap flags through the vfs dedupe functions Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=153938925037.8361.16126790489559826169.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=amir73il@gmail.com \
--cc=david@fromorbit.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=ocfs2-devel@oss.oracle.com \
--cc=sandeen@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).