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>

diff --git a/fs/read_write.c b/fs/read_write.c
index 201381689284669a61e29c071eb0fbd9603f7b5b..ebcbfc4f29075e871bf187935e4b18f18b1a8637 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -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. */
        ret = generic_remap_checks(file_in, pos_in, file_out, pos_out, len,
-                       (remap_flags & REMAP_FILE_DEDUP));
+                       remap_flags);
        if (ret)
                return ret;
 

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 631c28ce1436dfade8a7e0352770a76b66ca3911..c5435ca811329f03806cf85cec5a75b8d7e92bac 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -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 int generic_remap_checks(struct file *file_in, loff_t pos_in,
                                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_write_iter(struct kiocb *, struct iov_iter *);
 extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *);

diff --git a/mm/filemap.c b/mm/filemap.c
index 84b7301e41a01a71163d46dde2c2eed05e0c6ad2..410dc58f7b166858a726efbc516d20733c0b0b18 100644 (file)
--- 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;