mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 21:38:32 +08:00
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>
This commit is contained in:
parent
a83ab01a62
commit
6095028b45
@ -1686,7 +1686,7 @@ out2:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int clone_verify_area(struct file *file, loff_t pos, u64 len, bool write)
|
||||
static int remap_verify_area(struct file *file, loff_t pos, u64 len, bool write)
|
||||
{
|
||||
struct inode *inode = file_inode(file);
|
||||
|
||||
@ -1852,11 +1852,11 @@ int do_clone_file_range(struct file *file_in, loff_t pos_in,
|
||||
if (!file_in->f_op->clone_file_range)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
ret = clone_verify_area(file_in, pos_in, len, false);
|
||||
ret = remap_verify_area(file_in, pos_in, len, false);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = clone_verify_area(file_out, pos_out, len, true);
|
||||
ret = remap_verify_area(file_out, pos_out, len, true);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@ -1989,7 +1989,7 @@ int vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos,
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = clone_verify_area(dst_file, dst_pos, len, true);
|
||||
ret = remap_verify_area(dst_file, dst_pos, len, true);
|
||||
if (ret < 0)
|
||||
goto out_drop_write;
|
||||
|
||||
@ -2051,7 +2051,7 @@ int vfs_dedupe_file_range(struct file *file, struct file_dedupe_range *same)
|
||||
if (!S_ISREG(src->i_mode))
|
||||
goto out;
|
||||
|
||||
ret = clone_verify_area(file, off, len, false);
|
||||
ret = remap_verify_area(file, off, len, false);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
ret = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user