Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs: convert simple use of generic_file_*_mmap() to .mmap_prepare()

Since commit c84bf6dd2b83 ("mm: introduce new .mmap_prepare() file
callback"), the f_op->mmap() hook has been deprecated in favour of
f_op->mmap_prepare().

We have provided generic .mmap_prepare() equivalents, so update all file
systems that specify these directly in their file_operations structures.

This updates 9p, adfs, affs, bfs, fat, hfs, hfsplus, hostfs, hpfs, jffs2,
jfs, minix, omfs, ramfs and ufs file systems directly.

It updates generic_ro_fops which impacts qnx4, cramfs, befs, squashfs,
frebxfs, qnx6, efs, romfs, erofs and isofs file systems.

There are remaining file systems which use generic hooks in a less direct
way which we address in a subsequent commit.

Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Link: https://lore.kernel.org/c7dc90e44a9e75e750939ea369290d6e441a18e6.1750099179.git.lorenzo.stoakes@oracle.com
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Lorenzo Stoakes and committed by
Christian Brauner
951ea2f4 5b44297b

+16 -16
+1 -1
fs/9p/vfs_file.c
··· 516 516 .open = v9fs_file_open, 517 517 .release = v9fs_dir_release, 518 518 .lock = v9fs_file_lock, 519 - .mmap = generic_file_readonly_mmap, 519 + .mmap_prepare = generic_file_readonly_mmap_prepare, 520 520 .splice_read = v9fs_file_splice_read, 521 521 .splice_write = iter_file_splice_write, 522 522 .fsync = v9fs_file_fsync,
+1 -1
fs/adfs/file.c
··· 25 25 const struct file_operations adfs_file_operations = { 26 26 .llseek = generic_file_llseek, 27 27 .read_iter = generic_file_read_iter, 28 - .mmap = generic_file_mmap, 28 + .mmap_prepare = generic_file_mmap_prepare, 29 29 .fsync = generic_file_fsync, 30 30 .write_iter = generic_file_write_iter, 31 31 .splice_read = filemap_splice_read,
+1 -1
fs/affs/file.c
··· 999 999 .llseek = generic_file_llseek, 1000 1000 .read_iter = generic_file_read_iter, 1001 1001 .write_iter = generic_file_write_iter, 1002 - .mmap = generic_file_mmap, 1002 + .mmap_prepare = generic_file_mmap_prepare, 1003 1003 .open = affs_file_open, 1004 1004 .release = affs_file_release, 1005 1005 .fsync = affs_file_fsync,
+1 -1
fs/bfs/file.c
··· 27 27 .llseek = generic_file_llseek, 28 28 .read_iter = generic_file_read_iter, 29 29 .write_iter = generic_file_write_iter, 30 - .mmap = generic_file_mmap, 30 + .mmap_prepare = generic_file_mmap_prepare, 31 31 .splice_read = filemap_splice_read, 32 32 }; 33 33
+1 -1
fs/fat/file.c
··· 204 204 .llseek = generic_file_llseek, 205 205 .read_iter = generic_file_read_iter, 206 206 .write_iter = generic_file_write_iter, 207 - .mmap = generic_file_mmap, 207 + .mmap_prepare = generic_file_mmap_prepare, 208 208 .release = fat_file_release, 209 209 .unlocked_ioctl = fat_generic_ioctl, 210 210 .compat_ioctl = compat_ptr_ioctl,
+1 -1
fs/hfs/inode.c
··· 690 690 .llseek = generic_file_llseek, 691 691 .read_iter = generic_file_read_iter, 692 692 .write_iter = generic_file_write_iter, 693 - .mmap = generic_file_mmap, 693 + .mmap_prepare = generic_file_mmap_prepare, 694 694 .splice_read = filemap_splice_read, 695 695 .fsync = hfs_file_fsync, 696 696 .open = hfs_file_open,
+1 -1
fs/hfsplus/inode.c
··· 366 366 .llseek = generic_file_llseek, 367 367 .read_iter = generic_file_read_iter, 368 368 .write_iter = generic_file_write_iter, 369 - .mmap = generic_file_mmap, 369 + .mmap_prepare = generic_file_mmap_prepare, 370 370 .splice_read = filemap_splice_read, 371 371 .fsync = hfsplus_file_fsync, 372 372 .open = hfsplus_file_open,
+1 -1
fs/hostfs/hostfs_kern.c
··· 382 382 .splice_write = iter_file_splice_write, 383 383 .read_iter = generic_file_read_iter, 384 384 .write_iter = generic_file_write_iter, 385 - .mmap = generic_file_mmap, 385 + .mmap_prepare = generic_file_mmap_prepare, 386 386 .open = hostfs_open, 387 387 .release = hostfs_file_release, 388 388 .fsync = hostfs_fsync,
+1 -1
fs/hpfs/file.c
··· 255 255 .llseek = generic_file_llseek, 256 256 .read_iter = generic_file_read_iter, 257 257 .write_iter = generic_file_write_iter, 258 - .mmap = generic_file_mmap, 258 + .mmap_prepare = generic_file_mmap_prepare, 259 259 .release = hpfs_file_release, 260 260 .fsync = hpfs_file_fsync, 261 261 .splice_read = filemap_splice_read,
+1 -1
fs/jffs2/file.c
··· 54 54 .read_iter = generic_file_read_iter, 55 55 .write_iter = generic_file_write_iter, 56 56 .unlocked_ioctl=jffs2_ioctl, 57 - .mmap = generic_file_readonly_mmap, 57 + .mmap_prepare = generic_file_readonly_mmap_prepare, 58 58 .fsync = jffs2_fsync, 59 59 .splice_read = filemap_splice_read, 60 60 .splice_write = iter_file_splice_write,
+1 -1
fs/jfs/file.c
··· 143 143 .llseek = generic_file_llseek, 144 144 .read_iter = generic_file_read_iter, 145 145 .write_iter = generic_file_write_iter, 146 - .mmap = generic_file_mmap, 146 + .mmap_prepare = generic_file_mmap_prepare, 147 147 .splice_read = filemap_splice_read, 148 148 .splice_write = iter_file_splice_write, 149 149 .fsync = jfs_fsync,
+1 -1
fs/minix/file.c
··· 17 17 .llseek = generic_file_llseek, 18 18 .read_iter = generic_file_read_iter, 19 19 .write_iter = generic_file_write_iter, 20 - .mmap = generic_file_mmap, 20 + .mmap_prepare = generic_file_mmap_prepare, 21 21 .fsync = generic_file_fsync, 22 22 .splice_read = filemap_splice_read, 23 23 };
+1 -1
fs/omfs/file.c
··· 332 332 .llseek = generic_file_llseek, 333 333 .read_iter = generic_file_read_iter, 334 334 .write_iter = generic_file_write_iter, 335 - .mmap = generic_file_mmap, 335 + .mmap_prepare = generic_file_mmap_prepare, 336 336 .fsync = generic_file_fsync, 337 337 .splice_read = filemap_splice_read, 338 338 };
+1 -1
fs/ramfs/file-mmu.c
··· 41 41 const struct file_operations ramfs_file_operations = { 42 42 .read_iter = generic_file_read_iter, 43 43 .write_iter = generic_file_write_iter, 44 - .mmap = generic_file_mmap, 44 + .mmap_prepare = generic_file_mmap_prepare, 45 45 .fsync = noop_fsync, 46 46 .splice_read = filemap_splice_read, 47 47 .splice_write = iter_file_splice_write,
+1 -1
fs/read_write.c
··· 28 28 const struct file_operations generic_ro_fops = { 29 29 .llseek = generic_file_llseek, 30 30 .read_iter = generic_file_read_iter, 31 - .mmap = generic_file_readonly_mmap, 31 + .mmap_prepare = generic_file_readonly_mmap_prepare, 32 32 .splice_read = filemap_splice_read, 33 33 }; 34 34
+1 -1
fs/ufs/file.c
··· 38 38 .llseek = generic_file_llseek, 39 39 .read_iter = generic_file_read_iter, 40 40 .write_iter = generic_file_write_iter, 41 - .mmap = generic_file_mmap, 41 + .mmap_prepare = generic_file_mmap_prepare, 42 42 .open = generic_file_open, 43 43 .fsync = generic_file_fsync, 44 44 .splice_read = filemap_splice_read,