From: Andrew Morton Cc: Dmitriy Monakhov Cc: Christoph Hellwig Signed-off-by: Andrew Morton --- include/linux/fs.h | 3 +-- mm/filemap.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff -puN include/linux/fs.h~mm-move-common-segment-checks-to-separate-helper-function-v7-tidy include/linux/fs.h --- a/include/linux/fs.h~mm-move-common-segment-checks-to-separate-helper-function-v7-tidy +++ a/include/linux/fs.h @@ -1728,8 +1728,7 @@ extern void do_generic_mapping_read(stru struct file_ra_state *, struct file *, loff_t *, read_descriptor_t *, read_actor_t); extern int generic_segment_checks(const struct iovec *iov, - unsigned long *nr_segs, size_t *count, - unsigned long access_flags); + unsigned long *nr_segs, size_t *count, int access_flags); /* fs/splice.c */ extern ssize_t generic_file_splice_read(struct file *, loff_t *, diff -puN mm/filemap.c~mm-move-common-segment-checks-to-separate-helper-function-v7-tidy mm/filemap.c --- a/mm/filemap.c~mm-move-common-segment-checks-to-separate-helper-function-v7-tidy +++ a/mm/filemap.c @@ -1119,8 +1119,7 @@ success: * should return or zero in case that write should be allowed. */ int generic_segment_checks(const struct iovec *iov, - unsigned long *nr_segs, size_t *count, - unsigned long access_flags) + unsigned long *nr_segs, size_t *count, int access_flags) { unsigned long seg; size_t cnt = 0; _