Skip to content

Commit 951ea2f

Browse files
ljskernelbrauner
authored andcommitted
fs: convert simple use of generic_file_*_mmap() to .mmap_prepare()
Since commit c84bf6d ("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>
1 parent 5b44297 commit 951ea2f

16 files changed

Lines changed: 16 additions & 16 deletions

File tree

fs/9p/vfs_file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ const struct file_operations v9fs_file_operations = {
516516
.open = v9fs_file_open,
517517
.release = v9fs_dir_release,
518518
.lock = v9fs_file_lock,
519-
.mmap = generic_file_readonly_mmap,
519+
.mmap_prepare = generic_file_readonly_mmap_prepare,
520520
.splice_read = v9fs_file_splice_read,
521521
.splice_write = iter_file_splice_write,
522522
.fsync = v9fs_file_fsync,

fs/adfs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
const struct file_operations adfs_file_operations = {
2626
.llseek = generic_file_llseek,
2727
.read_iter = generic_file_read_iter,
28-
.mmap = generic_file_mmap,
28+
.mmap_prepare = generic_file_mmap_prepare,
2929
.fsync = generic_file_fsync,
3030
.write_iter = generic_file_write_iter,
3131
.splice_read = filemap_splice_read,

fs/affs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ const struct file_operations affs_file_operations = {
999999
.llseek = generic_file_llseek,
10001000
.read_iter = generic_file_read_iter,
10011001
.write_iter = generic_file_write_iter,
1002-
.mmap = generic_file_mmap,
1002+
.mmap_prepare = generic_file_mmap_prepare,
10031003
.open = affs_file_open,
10041004
.release = affs_file_release,
10051005
.fsync = affs_file_fsync,

fs/bfs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const struct file_operations bfs_file_operations = {
2727
.llseek = generic_file_llseek,
2828
.read_iter = generic_file_read_iter,
2929
.write_iter = generic_file_write_iter,
30-
.mmap = generic_file_mmap,
30+
.mmap_prepare = generic_file_mmap_prepare,
3131
.splice_read = filemap_splice_read,
3232
};
3333

fs/fat/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ const struct file_operations fat_file_operations = {
204204
.llseek = generic_file_llseek,
205205
.read_iter = generic_file_read_iter,
206206
.write_iter = generic_file_write_iter,
207-
.mmap = generic_file_mmap,
207+
.mmap_prepare = generic_file_mmap_prepare,
208208
.release = fat_file_release,
209209
.unlocked_ioctl = fat_generic_ioctl,
210210
.compat_ioctl = compat_ptr_ioctl,

fs/hfs/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ static const struct file_operations hfs_file_operations = {
690690
.llseek = generic_file_llseek,
691691
.read_iter = generic_file_read_iter,
692692
.write_iter = generic_file_write_iter,
693-
.mmap = generic_file_mmap,
693+
.mmap_prepare = generic_file_mmap_prepare,
694694
.splice_read = filemap_splice_read,
695695
.fsync = hfs_file_fsync,
696696
.open = hfs_file_open,

fs/hfsplus/inode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ static const struct file_operations hfsplus_file_operations = {
366366
.llseek = generic_file_llseek,
367367
.read_iter = generic_file_read_iter,
368368
.write_iter = generic_file_write_iter,
369-
.mmap = generic_file_mmap,
369+
.mmap_prepare = generic_file_mmap_prepare,
370370
.splice_read = filemap_splice_read,
371371
.fsync = hfsplus_file_fsync,
372372
.open = hfsplus_file_open,

fs/hostfs/hostfs_kern.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ static const struct file_operations hostfs_file_fops = {
382382
.splice_write = iter_file_splice_write,
383383
.read_iter = generic_file_read_iter,
384384
.write_iter = generic_file_write_iter,
385-
.mmap = generic_file_mmap,
385+
.mmap_prepare = generic_file_mmap_prepare,
386386
.open = hostfs_open,
387387
.release = hostfs_file_release,
388388
.fsync = hostfs_fsync,

fs/hpfs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ const struct file_operations hpfs_file_ops =
255255
.llseek = generic_file_llseek,
256256
.read_iter = generic_file_read_iter,
257257
.write_iter = generic_file_write_iter,
258-
.mmap = generic_file_mmap,
258+
.mmap_prepare = generic_file_mmap_prepare,
259259
.release = hpfs_file_release,
260260
.fsync = hpfs_file_fsync,
261261
.splice_read = filemap_splice_read,

fs/jffs2/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const struct file_operations jffs2_file_operations =
5454
.read_iter = generic_file_read_iter,
5555
.write_iter = generic_file_write_iter,
5656
.unlocked_ioctl=jffs2_ioctl,
57-
.mmap = generic_file_readonly_mmap,
57+
.mmap_prepare = generic_file_readonly_mmap_prepare,
5858
.fsync = jffs2_fsync,
5959
.splice_read = filemap_splice_read,
6060
.splice_write = iter_file_splice_write,

0 commit comments

Comments
 (0)