diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2018-10-30 00:41:34 +0100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2018-10-30 00:41:34 +0100 |
| commit | 3d28193e1df043764deb7abdaba5e3a6660bc393 (patch) | |
| tree | 6f157e2e8e0ac5b77f7f25fedfab91b93c73293c /mm | |
| parent | vfs: pass remap flags to generic_remap_file_range_prep (diff) | |
| download | linux-3d28193e1df043764deb7abdaba5e3a6660bc393.tar.xz linux-3d28193e1df043764deb7abdaba5e3a6660bc393.zip | |
vfs: pass remap flags to generic_remap_checks
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>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 84b7301e41a0..410dc58f7b16 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2994,7 +2994,7 @@ EXPORT_SYMBOL(generic_write_checks); */ int generic_remap_checks(struct file *file_in, loff_t pos_in, 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_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); /* 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_out >= size_out || pos_out + count > size_out)) return -EINVAL; |