diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-23 21:33:41 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-23 21:33:41 +0300 |
| commit | c4728cfbed0f54eacc21138c99da2a91895c8c5a (patch) | |
| tree | 61e9ed33dd81da4e5ea9c485964ea9214a6c8b10 /include/linux | |
| parent | f9a705ad1c077ec2872c641f0db9c0d5b4a097bb (diff) | |
| parent | 407e9c63ee571f44a2dfb0828fc30daa02abb6dc (diff) | |
| download | linux-c4728cfbed0f54eacc21138c99da2a91895c8c5a.tar.xz | |
Merge tag 'vfs-5.10-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull clone/dedupe/remap code refactoring from Darrick Wong:
"Move the generic file range remap (aka reflink and dedupe) functions
out of mm/filemap.c and fs/read_write.c and into fs/remap_range.c to
reduce clutter in the first two files"
* tag 'vfs-5.10-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
vfs: move the generic write and copy checks out of mm
vfs: move the remap range helpers to remap_range.c
vfs: move generic_remap_checks out of mm
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 83817d24e902..16e3789634d3 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2946,13 +2946,9 @@ extern int sb_min_blocksize(struct super_block *, int); extern int generic_file_mmap(struct file *, struct vm_area_struct *); 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, - loff_t *count, unsigned int remap_flags); +extern int generic_write_check_limits(struct file *file, loff_t pos, + loff_t *count); extern int generic_file_rw_checks(struct file *file_in, struct file *file_out); -extern int generic_copy_file_checks(struct file *file_in, loff_t pos_in, - struct file *file_out, loff_t pos_out, - size_t *count, unsigned int flags); extern ssize_t generic_file_buffered_read(struct kiocb *iocb, struct iov_iter *to, ssize_t already_read); extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *); |