aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2018-10-29 19:41:14 -0400
committerDave Chinner <david@fromorbit.com>2018-10-29 19:41:14 -0400
commit6095028b455d775e369ae27875f698ff0f6fdeb8 (patch)
treec1a8d7916f298a534a919e4f54c21ed7751d5b71
parenta83ab01a62e61616ebb8b97f90f568c1214dc10d (diff)
vfs: rename clone_verify_area to remap_verify_area
Since we use clone_verify_area for both clone and dedupe range checks, rename the function to make it clear that it's for both. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
-rw-r--r--fs/read_write.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/read_write.c b/fs/read_write.c
index aca75a97a695..734c5661fb69 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1686,7 +1686,7 @@ out2:
1686 return ret; 1686 return ret;
1687} 1687}
1688 1688
1689static int clone_verify_area(struct file *file, loff_t pos, u64 len, bool write) 1689static int remap_verify_area(struct file *file, loff_t pos, u64 len, bool write)
1690{ 1690{
1691 struct inode *inode = file_inode(file); 1691 struct inode *inode = file_inode(file);
1692 1692
@@ -1852,11 +1852,11 @@ int do_clone_file_range(struct file *file_in, loff_t pos_in,
1852 if (!file_in->f_op->clone_file_range) 1852 if (!file_in->f_op->clone_file_range)
1853 return -EOPNOTSUPP; 1853 return -EOPNOTSUPP;
1854 1854
1855 ret = clone_verify_area(file_in, pos_in, len, false); 1855 ret = remap_verify_area(file_in, pos_in, len, false);
1856 if (ret) 1856 if (ret)
1857 return ret; 1857 return ret;
1858 1858
1859 ret = clone_verify_area(file_out, pos_out, len, true); 1859 ret = remap_verify_area(file_out, pos_out, len, true);
1860 if (ret) 1860 if (ret)
1861 return ret; 1861 return ret;
1862 1862
@@ -1989,7 +1989,7 @@ int vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos,
1989 if (ret) 1989 if (ret)
1990 return ret; 1990 return ret;
1991 1991
1992 ret = clone_verify_area(dst_file, dst_pos, len, true); 1992 ret = remap_verify_area(dst_file, dst_pos, len, true);
1993 if (ret < 0) 1993 if (ret < 0)
1994 goto out_drop_write; 1994 goto out_drop_write;
1995 1995
@@ -2051,7 +2051,7 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
2051 if (!S_ISREG(src->i_mode)) 2051 if (!S_ISREG(src->i_mode))
2052 goto out; 2052 goto out;
2053 2053
2054 ret = clone_verify_area(file, off, len, false); 2054 ret = remap_verify_area(file, off, len, false);
2055 if (ret < 0) 2055 if (ret < 0)
2056 goto out; 2056 goto out;
2057 ret = 0; 2057 ret = 0;