iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vfs: pass remap flags to generic_remap_checks

Browse Source 
Pass the same remap flags to generic_remap_checks for consistency.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Darrick J. Wong 2018-10-30 10:41:34 +11:00 committed by Dave Chinner
parent a91ae49bba
commit 3d28193e1d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/read_write.c
View File

@ -1782,7 +1782,7 @@ int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
/* Check that we don't violate system file offset limits. */ /* Check that we don't violate system file offset limits. */
ret = generic_remap_checks(file_in, pos_in, file_out, pos_out, len, ret = generic_remap_checks(file_in, pos_in, file_out, pos_out, len,
(remap_flags & REMAP_FILE_DEDUP)); remap_flags);
if (ret) if (ret)
return ret; return ret;

2
include/linux/fs.h
View File

@ -2986,7 +2986,7 @@ extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);
extern ssize_t generic_write_checks(struct kiocb *, struct iov_iter *); extern ssize_t generic_write_checks(struct kiocb *, struct iov_iter *);
extern int generic_remap_checks(struct file *file_in, loff_t pos_in, extern int generic_remap_checks(struct file *file_in, loff_t pos_in,
struct file *file_out, loff_t pos_out, struct file *file_out, loff_t pos_out,
uint64_t *count, bool is_dedupe); uint64_t *count, unsigned int remap_flags);
extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *); extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *);
extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *); extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *);
extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *); extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *);

4
mm/filemap.c
View File

@ -2994,7 +2994,7 @@ EXPORT_SYMBOL(generic_write_checks);
*/ */
int generic_remap_checks(struct file *file_in, loff_t pos_in, int generic_remap_checks(struct file *file_in, loff_t pos_in,
struct file *file_out, loff_t pos_out, struct file *file_out, loff_t pos_out,
uint64_t *req_count, bool is_dedupe) uint64_t *req_count, unsigned int remap_flags)
{ {
struct inode *inode_in = file_in->f_mapping->host; struct inode *inode_in = file_in->f_mapping->host;
struct inode *inode_out = file_out->f_mapping->host; struct inode *inode_out = file_out->f_mapping->host;
@ -3016,7 +3016,7 @@ int generic_remap_checks(struct file *file_in, loff_t pos_in,
size_out = i_size_read(inode_out); size_out = i_size_read(inode_out);
/* Dedupe requires both ranges to be within EOF. */ /* Dedupe requires both ranges to be within EOF. */
if (is_dedupe && if ((remap_flags & REMAP_FILE_DEDUP) &&
(pos_in >= size_in || pos_in + count > size_in || (pos_in >= size_in || pos_in + count > size_in ||
pos_out >= size_out || pos_out + count > size_out)) pos_out >= size_out || pos_out + count > size_out))
return -EINVAL; return -EINVAL;