[PATCH 11/25] vfs: pass remap flags to generic_remap_file_range_prep

Darrick J. Wong
2018-10-11T04:13:42Z

Plumb the remap flags through the filesystem from the vfs function
dispatcher all the way to the prep function to prepare for behavior
changes in subsequent patches.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
---
fs/ocfs2/file.c | 2 +-
fs/ocfs2/refcounttree.c | 6 +++---
fs/ocfs2/refcounttree.h | 2 +-
fs/read_write.c | 10 ++++++----
fs/xfs/xfs_file.c | 2 +-
fs/xfs/xfs_reflink.c | 16 +++++++++-------
fs/xfs/xfs_reflink.h | 3 ++-
include/linux/fs.h | 5 +++--
8 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 852cdfaadd89..53c8676a0daf 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2538,7 +2538,7 @@ static int ocfs2_remap_file_range(struct file *file_in,
return -EINVAL;

return ocfs2_reflink_remap_range(file_in, pos_in, file_out, pos_out,
- len, remap_flags & RFR_SAME_DATA);
+ len, remap_flags);
}

const struct inode_operations ocfs2_file_iops = {
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index ee1ed11379b3..270a5b1919f6 100644
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -4825,7 +4825,7 @@ int ocfs2_reflink_remap_range(struct file *file_in,
struct file *file_out,
loff_t pos_out,
u64 len,
- bool is_dedupe)
+ unsigned int remap_flags)
{
struct inode *inode_in = file_inode(file_in);
struct inode *inode_out = file_inode(file_out);
@@ -4851,7 +4851,7 @@ int ocfs2_reflink_remap_range(struct file *file_in,
goto out_unlock;

ret = generic_remap_file_range_prep(file_in, pos_in, file_out, pos_out,
- &len, is_dedupe);
+ &len, remap_flags);
if (ret <= 0)
goto out_unlock;

@@ -4859,7 +4859,7 @@ int ocfs2_reflink_remap_range(struct file *file_in,
* Update inode timestamps and remove security privileges before we
* take the ilock.
*/
- ret = generic_remap_file_range_touch(file_out, is_dedupe);
+ ret = generic_remap_file_range_touch(file_out, remap_flags);
if (ret)
goto out_unlock;

diff --git a/fs/ocfs2/refcounttree.h b/fs/ocfs2/refcounttree.h
index 4af55bf4b35b..d2c5f526edff 100644
--- a/fs/ocfs2/refcounttree.h
+++ b/fs/ocfs2/refcounttree.h
@@ -120,6 +120,6 @@ int ocfs2_reflink_remap_range(struct file *file_in,
struct file *file_out,
loff_t pos_out,
u64 len,
- bool is_dedupe);
+ unsigned int remap_flags);

#endif /* OCFS2_REFCOUNTTREE_H */
diff --git a/fs/read_write.c b/fs/read_write.c
index b233fe019fae..bd5f8d724b13 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1712,18 +1712,20 @@ static int remap_verify_area(struct file *file, loff_t pos, u64 len, bool write)
/*
* Check that the two inodes are eligible for cloning, the ranges make
* sense, and then flush all dirty data. Caller must ensure that the
- * inodes have been locked against any other modifications.
+ * inodes have been locked against any other modifications. This function
+ * takes RFR_* flags in remap_flags.
*
* Returns: 0 for "nothing to clone", 1 for "something to clone", or
* the usual negative error code.
*/
int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
struct file *file_out, loff_t pos_out,
- u64 *len, bool is_dedupe)
+ u64 *len, unsigned int remap_flags)
{
struct inode *inode_in = file_inode(file_in);
struct inode *inode_out = file_inode(file_out);
u64 blkmask = i_blocksize(inode_in) - 1;
+ bool is_dedupe = (remap_flags & RFR_SAME_DATA);
bool same_inode = (inode_in == inode_out);
int ret;

@@ -1812,12 +1814,12 @@ int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
EXPORT_SYMBOL(generic_remap_file_range_prep);

/* Update inode timestamps and remove security privileges when remapping. */
-int generic_remap_file_range_touch(struct file *file, bool is_dedupe)
+int generic_remap_file_range_touch(struct file *file, unsigned int remap_flags)
{
int ret;

/* If can't alter the file contents, we're done. */
- if (is_dedupe)
+ if (remap_flags & RFR_SAME_DATA)
return 0;

/* Update the timestamps, since we can alter file contents. */
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 7cce438f856a..dce01729e522 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -932,7 +932,7 @@ xfs_file_remap_range(
return -EINVAL;

return xfs_reflink_remap_range(file_in, pos_in, file_out, pos_out,
- len, remap_flags & RFR_SAME_DATA);
+ len, remap_flags);
}

STATIC int
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index 99f2ea4fcaba..ada3b80267c6 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -921,10 +921,11 @@ xfs_reflink_update_dest(
struct xfs_inode *dest,
xfs_off_t newlen,
xfs_extlen_t cowextsize,
- bool is_dedupe)
+ unsigned int remap_flags)
{
struct xfs_mount *mp = dest->i_mount;
struct xfs_trans *tp;
+ bool is_dedupe = (remap_flags & RFR_SAME_DATA);
int error;

if (is_dedupe && newlen <= i_size_read(VFS_I(dest)) && cowextsize == 0)
@@ -1296,13 +1297,14 @@ xfs_reflink_remap_prep(
struct file *file_out,
loff_t pos_out,
u64 *len,
- bool is_dedupe)
+ unsigned int remap_flags)
{
struct inode *inode_in = file_inode(file_in);
struct xfs_inode *src = XFS_I(inode_in);
struct inode *inode_out = file_inode(file_out);
struct xfs_inode *dest = XFS_I(inode_out);
bool same_inode = (inode_in == inode_out);
+ bool is_dedupe = (remap_flags & RFR_SAME_DATA);
u64 blkmask = i_blocksize(inode_in) - 1;
ssize_t ret;

@@ -1327,7 +1329,7 @@ xfs_reflink_remap_prep(
goto out_unlock;

ret = generic_remap_file_range_prep(file_in, pos_in, file_out, pos_out,
- len, is_dedupe);
+ len, remap_flags);
if (ret <= 0)
goto out_unlock;

@@ -1375,7 +1377,7 @@ xfs_reflink_remap_prep(
* Update inode timestamps and remove security privileges before we
* take the ilock.
*/
- ret = generic_remap_file_range_touch(file_out, is_dedupe);
+ ret = generic_remap_file_range_touch(file_out, remap_flags);
if (ret)
goto out_unlock;

@@ -1395,7 +1397,7 @@ xfs_reflink_remap_range(
struct file *file_out,
loff_t pos_out,
u64 len,
- bool is_dedupe)
+ unsigned int remap_flags)
{
struct inode *inode_in = file_inode(file_in);
struct xfs_inode *src = XFS_I(inode_in);
@@ -1415,7 +1417,7 @@ xfs_reflink_remap_range(

/* Prepare and then clone file data. */
ret = xfs_reflink_remap_prep(file_in, pos_in, file_out, pos_out,
- &len, is_dedupe);
+ &len, remap_flags);
if (ret <= 0)
return ret;

@@ -1442,7 +1444,7 @@ xfs_reflink_remap_range(
cowextsize = src->i_d.di_cowextsize;

ret = xfs_reflink_update_dest(dest, pos_out + len, cowextsize,
- is_dedupe);
+ remap_flags);

out_unlock:
xfs_reflink_remap_unlock(file_in, file_out);
diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h
index c585ad9552b2..6f82d628bf17 100644
--- a/fs/xfs/xfs_reflink.h
+++ b/fs/xfs/xfs_reflink.h
@@ -28,7 +28,8 @@ extern int xfs_reflink_end_cow(struct xfs_inode *ip, xfs_off_t offset,
xfs_off_t count);
extern int xfs_reflink_recover_cow(struct xfs_mount *mp);
extern int xfs_reflink_remap_range(struct file *file_in, loff_t pos_in,
- struct file *file_out, loff_t pos_out, u64 len, bool is_dedupe);
+ struct file *file_out, loff_t pos_out, u64 len,
+ unsigned int remap_flags);
extern int xfs_reflink_inode_has_shared_extents(struct xfs_trans *tp,
struct xfs_inode *ip, bool *has_shared);
extern int xfs_reflink_clear_inode_flag(struct xfs_inode *ip,
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 91fd3c77763b..b67f108932a5 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1846,8 +1846,9 @@ extern ssize_t vfs_copy_file_range(struct file *, loff_t , struct file *,
loff_t, size_t, unsigned int);
extern int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
struct file *file_out, loff_t pos_out,
- u64 *count, bool is_dedupe);
-extern int generic_remap_file_range_touch(struct file *file, bool is_dedupe);
+ u64 *count, unsigned int remap_flags);
+extern int generic_remap_file_range_touch(struct file *file,
+ unsigned int remap_flags);
extern int do_clone_file_range(struct file *file_in, loff_t pos_in,
struct file *file_out, loff_t pos_out, u64 len);
extern int vfs_clone_file_range(struct file *file_in, loff_t pos_in,