Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d28193e authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Dave Chinner
Browse files

vfs: pass remap flags to generic_remap_checks 



Pass the same remap flags to generic_remap_checks for consistency.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent a91ae49b

fs/read_write.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *);

mm/filemap.c

+2 −2
Original line number Diff line number Diff line
@@ -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;