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/29] vfs: plumb remap flags through the vfs dedupe functions
Date: Wed, 17 Oct 2018 15:46:05 -0700 [thread overview]
Message-ID: <153981636536.5568.11691478301880924161.stgit@magnolia> (raw)
In-Reply-To: <153981625504.5568.2708520119290577378.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 0393815c8971..84dd957efa24 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 0d1ac1b9bc22..ea30666013b0 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -2010,10 +2010,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 & ~(REMAP_FILE_DEDUP));
+
ret = mnt_want_write_file(dst_file);
if (ret)
return ret;
@@ -2044,7 +2046,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, REMAP_FILE_DEDUP);
+ dst_pos, len, remap_flags | REMAP_FILE_DEDUP);
out_drop_write:
mnt_drop_write_file(dst_file);
@@ -2112,7 +2114,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 bc78ad7e21b2..ea2c2f673ecb 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1854,7 +1854,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-17 22:46 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 22:44 [PATCH v6 00/29] fs: fixes for serious clone/dedupe problems Darrick J. Wong
2018-10-17 22:44 ` [PATCH 01/29] vfs: vfs_clone_file_prep_inodes should return EINVAL for a clone from beyond EOF Darrick J. Wong
2018-10-17 22:44 ` [PATCH 02/29] vfs: check file ranges before cloning files Darrick J. Wong
2018-10-17 22:44 ` [PATCH 03/29] vfs: exit early from zero length remap operations Darrick J. Wong
2018-10-17 22:44 ` [PATCH 04/29] vfs: strengthen checking of file range inputs to generic_remap_checks Darrick J. Wong
2018-10-18 0:41 ` Al Viro
2018-10-18 4:37 ` Darrick J. Wong
2018-10-18 18:56 ` [PATCH v2 " Darrick J. Wong
2018-10-17 22:44 ` [PATCH 05/29] vfs: avoid problematic remapping requests into partial EOF block Darrick J. Wong
2018-10-17 22:44 ` [PATCH 06/29] vfs: skip zero-length dedupe requests Darrick J. Wong
2018-10-17 22:45 ` [PATCH 07/29] vfs: rename vfs_clone_file_prep to be more descriptive Darrick J. Wong
2018-10-17 22:45 ` [PATCH 08/29] vfs: rename clone_verify_area to remap_verify_area Darrick J. Wong
2018-10-17 22:45 ` [PATCH 09/29] vfs: combine the clone and dedupe into a single remap_file_range Darrick J. Wong
2018-10-18 0:48 ` Al Viro
2018-10-18 4:47 ` Darrick J. Wong
2018-10-18 4:54 ` Al Viro
2018-10-18 5:03 ` Darrick J. Wong
2018-10-18 18:57 ` [PATCH v2 " Darrick J. Wong
2018-10-17 22:45 ` [PATCH 10/29] vfs: pass remap flags to generic_remap_file_range_prep Darrick J. Wong
2018-10-17 22:45 ` [PATCH 11/29] vfs: pass remap flags to generic_remap_checks Darrick J. Wong
2018-10-17 22:45 ` [PATCH 12/29] vfs: remap helper should update destination inode metadata Darrick J. Wong
2018-10-17 22:45 ` [PATCH 13/29] vfs: make remap_file_range functions take and return bytes completed Darrick J. Wong
2018-10-18 18:57 ` [PATCH v2 " Darrick J. Wong
2018-10-17 22:45 ` [PATCH 14/29] vfs: plumb remap flags through the vfs clone functions Darrick J. Wong
2018-10-17 22:46 ` Darrick J. Wong [this message]
2018-10-17 22:46 ` [PATCH 16/29] vfs: enable remap callers that can handle short operations Darrick J. Wong
2018-10-18 18:58 ` [PATCH v2 " Darrick J. Wong
2018-10-17 22:46 ` [PATCH 17/29] vfs: hide file range comparison function Darrick J. Wong
2018-10-17 22:46 ` [PATCH 18/29] vfs: clean up generic_remap_file_range_prep return value Darrick J. Wong
2018-10-17 22:46 ` [PATCH 19/29] ocfs2: truncate page cache for clone destination file before remapping Darrick J. Wong
2018-10-17 22:46 ` [PATCH 20/29] ocfs2: fix pagecache truncation prior to reflink Darrick J. Wong
2018-10-17 22:46 ` [PATCH 21/29] ocfs2: support partial clone range and dedupe range Darrick J. Wong
2018-10-17 22:46 ` [PATCH 22/29] ocfs2: remove ocfs2_reflink_remap_range Darrick J. Wong
2018-10-17 22:46 ` [PATCH 23/29] xfs: add a per-xfs trace_printk macro Darrick J. Wong
2018-10-17 22:47 ` [PATCH 24/29] xfs: fix pagecache truncation prior to reflink Darrick J. Wong
2018-10-17 22:47 ` [PATCH 25/29] xfs: clean up xfs_reflink_remap_blocks call site Darrick J. Wong
2018-10-17 22:47 ` [PATCH 26/29] xfs: support returning partial reflink results Darrick J. Wong
2018-10-17 22:47 ` [PATCH 27/29] xfs: remove redundant remap partial EOF block checks Darrick J. Wong
2018-10-17 22:47 ` [PATCH 28/29] xfs: remove xfs_reflink_remap_range Darrick J. Wong
2018-10-17 22:47 ` [PATCH 29/29] xfs: remove [cm]time update from reflink calls 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=153981636536.5568.11691478301880924161.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