mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
fs: convert simple use of generic_file_*_mmap() to .mmap_prepare()
Since commit c84bf6dd2b
("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>
This commit is contained in:
parent
5b44297bcf
commit
951ea2f484
@ -516,7 +516,7 @@ const struct file_operations v9fs_file_operations = {
|
|||||||
.open = v9fs_file_open,
|
.open = v9fs_file_open,
|
||||||
.release = v9fs_dir_release,
|
.release = v9fs_dir_release,
|
||||||
.lock = v9fs_file_lock,
|
.lock = v9fs_file_lock,
|
||||||
.mmap = generic_file_readonly_mmap,
|
.mmap_prepare = generic_file_readonly_mmap_prepare,
|
||||||
.splice_read = v9fs_file_splice_read,
|
.splice_read = v9fs_file_splice_read,
|
||||||
.splice_write = iter_file_splice_write,
|
.splice_write = iter_file_splice_write,
|
||||||
.fsync = v9fs_file_fsync,
|
.fsync = v9fs_file_fsync,
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
const struct file_operations adfs_file_operations = {
|
const struct file_operations adfs_file_operations = {
|
||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.fsync = generic_file_fsync,
|
.fsync = generic_file_fsync,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
|
@ -999,7 +999,7 @@ const struct file_operations affs_file_operations = {
|
|||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.open = affs_file_open,
|
.open = affs_file_open,
|
||||||
.release = affs_file_release,
|
.release = affs_file_release,
|
||||||
.fsync = affs_file_fsync,
|
.fsync = affs_file_fsync,
|
||||||
|
@ -27,7 +27,7 @@ const struct file_operations bfs_file_operations = {
|
|||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -204,7 +204,7 @@ const struct file_operations fat_file_operations = {
|
|||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.release = fat_file_release,
|
.release = fat_file_release,
|
||||||
.unlocked_ioctl = fat_generic_ioctl,
|
.unlocked_ioctl = fat_generic_ioctl,
|
||||||
.compat_ioctl = compat_ptr_ioctl,
|
.compat_ioctl = compat_ptr_ioctl,
|
||||||
|
@ -690,7 +690,7 @@ static const struct file_operations hfs_file_operations = {
|
|||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
.fsync = hfs_file_fsync,
|
.fsync = hfs_file_fsync,
|
||||||
.open = hfs_file_open,
|
.open = hfs_file_open,
|
||||||
|
@ -366,7 +366,7 @@ static const struct file_operations hfsplus_file_operations = {
|
|||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
.fsync = hfsplus_file_fsync,
|
.fsync = hfsplus_file_fsync,
|
||||||
.open = hfsplus_file_open,
|
.open = hfsplus_file_open,
|
||||||
|
@ -382,7 +382,7 @@ static const struct file_operations hostfs_file_fops = {
|
|||||||
.splice_write = iter_file_splice_write,
|
.splice_write = iter_file_splice_write,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.open = hostfs_open,
|
.open = hostfs_open,
|
||||||
.release = hostfs_file_release,
|
.release = hostfs_file_release,
|
||||||
.fsync = hostfs_fsync,
|
.fsync = hostfs_fsync,
|
||||||
|
@ -255,7 +255,7 @@ const struct file_operations hpfs_file_ops =
|
|||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.release = hpfs_file_release,
|
.release = hpfs_file_release,
|
||||||
.fsync = hpfs_file_fsync,
|
.fsync = hpfs_file_fsync,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
|
@ -54,7 +54,7 @@ const struct file_operations jffs2_file_operations =
|
|||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.unlocked_ioctl=jffs2_ioctl,
|
.unlocked_ioctl=jffs2_ioctl,
|
||||||
.mmap = generic_file_readonly_mmap,
|
.mmap_prepare = generic_file_readonly_mmap_prepare,
|
||||||
.fsync = jffs2_fsync,
|
.fsync = jffs2_fsync,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
.splice_write = iter_file_splice_write,
|
.splice_write = iter_file_splice_write,
|
||||||
|
@ -143,7 +143,7 @@ const struct file_operations jfs_file_operations = {
|
|||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
.splice_write = iter_file_splice_write,
|
.splice_write = iter_file_splice_write,
|
||||||
.fsync = jfs_fsync,
|
.fsync = jfs_fsync,
|
||||||
|
@ -17,7 +17,7 @@ const struct file_operations minix_file_operations = {
|
|||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.fsync = generic_file_fsync,
|
.fsync = generic_file_fsync,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
};
|
};
|
||||||
|
@ -332,7 +332,7 @@ const struct file_operations omfs_file_operations = {
|
|||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.fsync = generic_file_fsync,
|
.fsync = generic_file_fsync,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
};
|
};
|
||||||
|
@ -41,7 +41,7 @@ static unsigned long ramfs_mmu_get_unmapped_area(struct file *file,
|
|||||||
const struct file_operations ramfs_file_operations = {
|
const struct file_operations ramfs_file_operations = {
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.fsync = noop_fsync,
|
.fsync = noop_fsync,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
.splice_write = iter_file_splice_write,
|
.splice_write = iter_file_splice_write,
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
const struct file_operations generic_ro_fops = {
|
const struct file_operations generic_ro_fops = {
|
||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.mmap = generic_file_readonly_mmap,
|
.mmap_prepare = generic_file_readonly_mmap_prepare,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ const struct file_operations ufs_file_operations = {
|
|||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read_iter = generic_file_read_iter,
|
.read_iter = generic_file_read_iter,
|
||||||
.write_iter = generic_file_write_iter,
|
.write_iter = generic_file_write_iter,
|
||||||
.mmap = generic_file_mmap,
|
.mmap_prepare = generic_file_mmap_prepare,
|
||||||
.open = generic_file_open,
|
.open = generic_file_open,
|
||||||
.fsync = generic_file_fsync,
|
.fsync = generic_file_fsync,
|
||||||
.splice_read = filemap_splice_read,
|
.splice_read = filemap_splice_read,
|
||||||
|
Loading…
Reference in New Issue
Block a user