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>

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 348cc90bf9c56b7184dbac73faffe8d5f3d2762e..2ff3e0ac72660315e70b046eaf104898845aa2fc 100644 (file)
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -516,7 +516,7 @@ const struct file_operations v9fs_file_operations = {
        .open = v9fs_file_open,
        .release = v9fs_dir_release,
        .lock = v9fs_file_lock,
-       .mmap = generic_file_readonly_mmap,
+       .mmap_prepare = generic_file_readonly_mmap_prepare,
        .splice_read = v9fs_file_splice_read,
        .splice_write = iter_file_splice_write,
        .fsync = v9fs_file_fsync,

diff --git a/fs/adfs/file.c b/fs/adfs/file.c
index ee80718aaeecc369b2249977962f103fb8b22135..cd13165fd904ab3400b0f95a00afaa43677cc383 100644 (file)
--- a/fs/adfs/file.c
+++ b/fs/adfs/file.c
@@ -25,7 +25,7 @@
 const struct file_operations adfs_file_operations = {
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .fsync          = generic_file_fsync,
        .write_iter     = generic_file_write_iter,
        .splice_read    = filemap_splice_read,

diff --git a/fs/affs/file.c b/fs/affs/file.c
index 7a71018e3f6758d410b09bc4453cd760bf20427c..fbac204b705538a4c7a995ee7d5b9dd4d5eb0071 100644 (file)
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -999,7 +999,7 @@ const struct file_operations affs_file_operations = {
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .open           = affs_file_open,
        .release        = affs_file_release,
        .fsync          = affs_file_fsync,

diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index fa66a09e496a815c265cdf07b1ed981983cbc596..6685c3411fe79edfe492a63e94b8d952c883256f 100644 (file)
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -27,7 +27,7 @@ const struct file_operations bfs_file_operations = {
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .splice_read    = filemap_splice_read,
 };
 

diff --git a/fs/fat/file.c b/fs/fat/file.c
index e887e9ab74728362c60614f2a8b0066f2c7fd44d..4fc49a614fb8fd64e219db60c6d9e7dd100aea1c 100644 (file)
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -204,7 +204,7 @@ const struct file_operations fat_file_operations = {
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .release        = fat_file_release,
        .unlocked_ioctl = fat_generic_ioctl,
        .compat_ioctl   = compat_ptr_ioctl,

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index a81ce7a740b918e505632d32b6efc35e9bd68362..d419586d668dd80a927ddbdc0a5911aaca3ed013 100644 (file)
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -690,7 +690,7 @@ static const struct file_operations hfs_file_operations = {
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .splice_read    = filemap_splice_read,
        .fsync          = hfs_file_fsync,
        .open           = hfs_file_open,

diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index f331e957421783819edaae4796d0b9babe9ede22..0af7e302730cbef5a51e85da5257dce3183db2cd 100644 (file)
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -366,7 +366,7 @@ static const struct file_operations hfsplus_file_operations = {
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .splice_read    = filemap_splice_read,
        .fsync          = hfsplus_file_fsync,
        .open           = hfsplus_file_open,

diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index 702c41317589a82c2e03ff474b4303c6dd336f52..bc22b6cc72afc5ad2747a383d8e7bdc19b4fa6ed 100644 (file)
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -382,7 +382,7 @@ static const struct file_operations hostfs_file_fops = {
        .splice_write   = iter_file_splice_write,
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .open           = hostfs_open,
        .release        = hostfs_file_release,
        .fsync          = hostfs_fsync,

diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index 449a3fc1b8d9000699561777fbcb6321013147d4..a1a44e3edb19839ad5214ead0a0030aead3cc0e6 100644 (file)
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c
@@ -255,7 +255,7 @@ const struct file_operations hpfs_file_ops =
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .release        = hpfs_file_release,
        .fsync          = hpfs_file_fsync,
        .splice_read    = filemap_splice_read,

diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 13c18ccc13b0ab8d36bf4d90154dbe5c647b266f..1e05f7fe5dd4aab11b14ec8162f886bd638bd76b 100644 (file)
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -54,7 +54,7 @@ const struct file_operations jffs2_file_operations =
        .read_iter =    generic_file_read_iter,
        .write_iter =   generic_file_write_iter,
        .unlocked_ioctl=jffs2_ioctl,
-       .mmap =         generic_file_readonly_mmap,
+       .mmap_prepare = generic_file_readonly_mmap_prepare,
        .fsync =        jffs2_fsync,
        .splice_read =  filemap_splice_read,
        .splice_write = iter_file_splice_write,

diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index 01b6912e60f80891f148a0c2679f5a35e6d74586..5e47951db630b1ec01c5416566b3ae7196e8e8bd 100644 (file)
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -143,7 +143,7 @@ const struct file_operations jfs_file_operations = {
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
        .fsync          = jfs_fsync,

diff --git a/fs/minix/file.c b/fs/minix/file.c
index 906d192ab7f342964d5d6b08a2225543730b0e9d..dca7ac71f0495219fe104d24173a86ce2a078fa1 100644 (file)
--- a/fs/minix/file.c
+++ b/fs/minix/file.c
@@ -17,7 +17,7 @@ const struct file_operations minix_file_operations = {
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .fsync          = generic_file_fsync,
        .splice_read    = filemap_splice_read,
 };

diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index 98358d405b6ab4010ff054b333d4ee5bc6ed8ee6..319c04e63964bb88f5d0e5237b3648033a541ba4 100644 (file)
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -332,7 +332,7 @@ const struct file_operations omfs_file_operations = {
        .llseek = generic_file_llseek,
        .read_iter = generic_file_read_iter,
        .write_iter = generic_file_write_iter,
-       .mmap = generic_file_mmap,
+       .mmap_prepare = generic_file_mmap_prepare,
        .fsync = generic_file_fsync,
        .splice_read = filemap_splice_read,
 };

diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c
index b45c7edc3225e4cfbeff17e28c2c2b0b8c17bd06..b11f5b20b78b83dd44b1b3b667f7fdda0cf5f334 100644 (file)
--- a/fs/ramfs/file-mmu.c
+++ b/fs/ramfs/file-mmu.c
@@ -41,7 +41,7 @@ static unsigned long ramfs_mmu_get_unmapped_area(struct file *file,
 const struct file_operations ramfs_file_operations = {
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .fsync          = noop_fsync,
        .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,

diff --git a/fs/read_write.c b/fs/read_write.c
index 0ef70e128c4af2b4ad318a88426d4b60d00d400a..80fdab99f9e4d35017c00aa97d938e01d288d0c0 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -28,7 +28,7 @@
 const struct file_operations generic_ro_fops = {
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
-       .mmap           = generic_file_readonly_mmap,
+       .mmap_prepare   = generic_file_readonly_mmap_prepare,
        .splice_read    = filemap_splice_read,
 };
 

diff --git a/fs/ufs/file.c b/fs/ufs/file.c
index 487ad1fc2de6e251539be0f51beee5c5699cb32e..c2a391c17df7f34d9961973909d1985f5f786e92 100644 (file)
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
@@ -38,7 +38,7 @@ const struct file_operations ufs_file_operations = {
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
-       .mmap           = generic_file_mmap,
+       .mmap_prepare   = generic_file_mmap_prepare,
        .open           = generic_file_open,
        .fsync          = generic_file_fsync,
        .splice_read    = filemap_splice_read,