From: Dave K. <dav...@or...> - 2012-11-21 22:42:18
|
These are the simple ones. File systems that use generic_file_aio_read() and generic_file_aio_write() can trivially support generic_file_read_iter() and generic_file_write_iter(). This patch adds those file_operations for 9p, adfs, affs, bfs, exofs, ext2, ext3, fat, hfs, hfsplus, hostfs, hpfs, jfs, jffs2, logfs, minix, nilfs2, omfs, ramfs, reiserfs, romfs, sysv, and ufs. Signed-off-by: Dave Kleikamp <dav...@or...> Cc: Zach Brown <za...@za...> Cc: v9f...@li... Cc: Tigran A. Aivazian <ti...@ai...> Cc: Jan Kara <ja...@su...> Cc: Andrew Morton <ak...@li...> Cc: Andreas Dilger <adi...@di...> Cc: lin...@vg... Cc: OGAWA Hirofumi <hir...@ma...> Cc: Boaz Harrosh <bha...@pa...> Cc: Benny Halevy <bh...@to...> Cc: os...@op... Cc: Jeff Dike <jd...@ad...> Cc: Richard Weinberger <ri...@no...> Cc: use...@li... Cc: Mikulas Patocka <mi...@ar...> Cc: jfs...@li... Cc: David Woodhouse <dw...@in...> Cc: lin...@li... Cc: Joern Engel <jo...@lo...> Cc: Prasad Joshi <pra...@gm...> Cc: lo...@lo... Cc: lin...@vg... Cc: Bob Copeland <me...@bo...> Cc: lin...@li... Cc: rei...@vg... Cc: Christoph Hellwig <hc...@in...> Cc: Evgeniy Dushistov <dus...@ma...> --- fs/9p/vfs_addr.c | 4 ++-- fs/9p/vfs_file.c | 8 ++++---- fs/adfs/file.c | 4 ++-- fs/affs/file.c | 4 ++-- fs/bfs/file.c | 4 ++-- fs/exofs/file.c | 4 ++-- fs/ext2/file.c | 4 ++-- fs/ext3/file.c | 4 ++-- fs/fat/file.c | 4 ++-- fs/hfs/inode.c | 4 ++-- fs/hfsplus/inode.c | 4 ++-- fs/hostfs/hostfs_kern.c | 4 ++-- fs/hpfs/file.c | 4 ++-- fs/jffs2/file.c | 8 ++++---- fs/jfs/file.c | 4 ++-- fs/logfs/file.c | 4 ++-- fs/minix/file.c | 4 ++-- fs/nilfs2/file.c | 4 ++-- fs/omfs/file.c | 4 ++-- fs/ramfs/file-mmu.c | 4 ++-- fs/ramfs/file-nommu.c | 4 ++-- fs/reiserfs/file.c | 4 ++-- fs/romfs/mmap-nommu.c | 2 +- fs/sysv/file.c | 4 ++-- fs/ufs/file.c | 4 ++-- 25 files changed, 53 insertions(+), 53 deletions(-) diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index e70f239..01c0673 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c @@ -249,8 +249,8 @@ static int v9fs_launder_page(struct page *page) * the VFS gets them, so this method should never be called. * * Direct IO is not 'yet' supported in the cached mode. Hence when - * this routine is called through generic_file_aio_read(), the read/write fails - * with an error. + * this routine is called through generic_file_read_iter(), the read/write + * fails with an error. * */ static ssize_t diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index c2483e9..2e9441d 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c @@ -746,8 +746,8 @@ const struct file_operations v9fs_cached_file_operations = { .llseek = generic_file_llseek, .read = v9fs_cached_file_read, .write = v9fs_cached_file_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .open = v9fs_file_open, .release = v9fs_dir_release, .lock = v9fs_file_lock, @@ -759,8 +759,8 @@ const struct file_operations v9fs_cached_file_operations_dotl = { .llseek = generic_file_llseek, .read = v9fs_cached_file_read, .write = v9fs_cached_file_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .open = v9fs_file_open, .release = v9fs_dir_release, .lock = v9fs_file_lock_dotl, diff --git a/fs/adfs/file.c b/fs/adfs/file.c index a36da53..da1e021 100644 --- a/fs/adfs/file.c +++ b/fs/adfs/file.c @@ -24,11 +24,11 @@ const struct file_operations adfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .splice_read = generic_file_splice_read, }; diff --git a/fs/affs/file.c b/fs/affs/file.c index 2f4c935..2becd58 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -28,9 +28,9 @@ static int affs_file_release(struct inode *inode, struct file *filp); const struct file_operations affs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .open = affs_file_open, .release = affs_file_release, diff --git a/fs/bfs/file.c b/fs/bfs/file.c index f20e8a7..50d4740 100644 --- a/fs/bfs/file.c +++ b/fs/bfs/file.c @@ -24,9 +24,9 @@ const struct file_operations bfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, }; diff --git a/fs/exofs/file.c b/fs/exofs/file.c index 491c6c0..20564f8a 100644 --- a/fs/exofs/file.c +++ b/fs/exofs/file.c @@ -69,8 +69,8 @@ const struct file_operations exofs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .open = generic_file_open, .release = exofs_release_file, diff --git a/fs/ext2/file.c b/fs/ext2/file.c index a5b3a5d..6af043b 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -64,8 +64,8 @@ const struct file_operations ext2_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .unlocked_ioctl = ext2_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = ext2_compat_ioctl, diff --git a/fs/ext3/file.c b/fs/ext3/file.c index 25cb413..a796771 100644 --- a/fs/ext3/file.c +++ b/fs/ext3/file.c @@ -52,8 +52,8 @@ const struct file_operations ext3_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .unlocked_ioctl = ext3_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = ext3_compat_ioctl, diff --git a/fs/fat/file.c b/fs/fat/file.c index a62e0ec..92d587b 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -164,8 +164,8 @@ const struct file_operations fat_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .release = fat_file_release, .unlocked_ioctl = fat_generic_ioctl, diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c index 986cb91..9d432c4 100644 --- a/fs/hfs/inode.c +++ b/fs/hfs/inode.c @@ -655,9 +655,9 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end, static const struct file_operations hfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, .fsync = hfs_file_fsync, diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index 94fc092..308db38 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c @@ -368,9 +368,9 @@ static const struct inode_operations hfsplus_file_inode_operations = { static const struct file_operations hfsplus_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, .fsync = hfsplus_file_fsync, diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 457addc..4593a9a 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -382,8 +382,8 @@ static const struct file_operations hostfs_file_fops = { .llseek = generic_file_llseek, .read = do_sync_read, .splice_read = generic_file_splice_read, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .write = do_sync_write, .mmap = generic_file_mmap, .open = hostfs_file_open, diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c index 89d2a58..cd9b95d6 100644 --- a/fs/hpfs/file.c +++ b/fs/hpfs/file.c @@ -155,9 +155,9 @@ const struct file_operations hpfs_file_ops = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = hpfs_file_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .release = hpfs_file_release, .fsync = hpfs_file_fsync, diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index 60ef3fb..8e372a3 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c @@ -51,10 +51,10 @@ const struct file_operations jffs2_file_operations = { .llseek = generic_file_llseek, .open = generic_file_open, - .read = do_sync_read, - .aio_read = generic_file_aio_read, - .write = do_sync_write, - .aio_write = generic_file_aio_write, + .read = do_sync_read, + .read_iter = generic_file_read_iter, + .write = do_sync_write, + .write_iter = generic_file_write_iter, .unlocked_ioctl=jffs2_ioctl, .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, diff --git a/fs/jfs/file.c b/fs/jfs/file.c index 9d3afd1..4686fb9 100644 --- a/fs/jfs/file.c +++ b/fs/jfs/file.c @@ -149,8 +149,8 @@ const struct file_operations jfs_file_operations = { .llseek = generic_file_llseek, .write = do_sync_write, .read = do_sync_read, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, diff --git a/fs/logfs/file.c b/fs/logfs/file.c index 3886cde..ca35c88 100644 --- a/fs/logfs/file.c +++ b/fs/logfs/file.c @@ -263,8 +263,8 @@ const struct inode_operations logfs_reg_iops = { }; const struct file_operations logfs_reg_fops = { - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .fsync = logfs_fsync, .unlocked_ioctl = logfs_ioctl, .llseek = generic_file_llseek, diff --git a/fs/minix/file.c b/fs/minix/file.c index 4493ce6..a7eeecb 100644 --- a/fs/minix/file.c +++ b/fs/minix/file.c @@ -15,9 +15,9 @@ const struct file_operations minix_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c index 16f35f7..2fc79cc 100644 --- a/fs/nilfs2/file.c +++ b/fs/nilfs2/file.c @@ -153,8 +153,8 @@ const struct file_operations nilfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .unlocked_ioctl = nilfs_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = nilfs_compat_ioctl, diff --git a/fs/omfs/file.c b/fs/omfs/file.c index 77e3cb2..1efeed5 100644 --- a/fs/omfs/file.c +++ b/fs/omfs/file.c @@ -332,8 +332,8 @@ const struct file_operations omfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c index 4884ac5..c4d8572 100644 --- a/fs/ramfs/file-mmu.c +++ b/fs/ramfs/file-mmu.c @@ -39,9 +39,9 @@ const struct address_space_operations ramfs_aops = { const struct file_operations ramfs_file_operations = { .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = noop_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c index d5378d0..1d6be6c 100644 --- a/fs/ramfs/file-nommu.c +++ b/fs/ramfs/file-nommu.c @@ -39,9 +39,9 @@ const struct file_operations ramfs_file_operations = { .mmap = ramfs_nommu_mmap, .get_unmapped_area = ramfs_nommu_get_unmapped_area, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .fsync = noop_fsync, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index 8375c92..83ecbd6 100644 --- a/fs/reiserfs/file.c +++ b/fs/reiserfs/file.c @@ -304,8 +304,8 @@ const struct file_operations reiserfs_file_operations = { .open = reiserfs_file_open, .release = reiserfs_file_release, .fsync = reiserfs_sync_file, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, diff --git a/fs/romfs/mmap-nommu.c b/fs/romfs/mmap-nommu.c index e1a7779..e34d51a 100644 --- a/fs/romfs/mmap-nommu.c +++ b/fs/romfs/mmap-nommu.c @@ -70,7 +70,7 @@ static int romfs_mmap(struct file *file, struct vm_area_struct *vma) const struct file_operations romfs_ro_fops = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .splice_read = generic_file_splice_read, .mmap = romfs_mmap, .get_unmapped_area = romfs_get_unmapped_area, diff --git a/fs/sysv/file.c b/fs/sysv/file.c index 0a65939..5443ff9 100644 --- a/fs/sysv/file.c +++ b/fs/sysv/file.c @@ -22,9 +22,9 @@ const struct file_operations sysv_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/ufs/file.c b/fs/ufs/file.c index 33afa20..e155e4c 100644 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c @@ -36,9 +36,9 @@ const struct file_operations ufs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .open = generic_file_open, .fsync = generic_file_fsync, -- 1.8.0 |
From: Dave K. <dav...@or...> - 2013-01-09 19:59:55
|
These are the simple ones. File systems that use generic_file_aio_read() and generic_file_aio_write() can trivially support generic_file_read_iter() and generic_file_write_iter(). This patch adds those file_operations for 9p, adfs, affs, bfs, exofs, ext2, ext3, fat, f2fs, hfs, hfsplus, hostfs, hpfs, jfs, jffs2, logfs, minix, nilfs2, omfs, ramfs, reiserfs, romfs, sysv, and ufs. Signed-off-by: Dave Kleikamp <dav...@or...> Cc: Zach Brown <za...@za...> Cc: v9f...@li... Cc: Tigran A. Aivazian <ti...@ai...> Cc: Jan Kara <ja...@su...> Cc: Andrew Morton <ak...@li...> Cc: Andreas Dilger <adi...@di...> Cc: lin...@vg... Cc: OGAWA Hirofumi <hir...@ma...> Cc: Boaz Harrosh <bha...@pa...> Cc: Benny Halevy <bh...@to...> Cc: os...@op... Cc: Jeff Dike <jd...@ad...> Cc: Richard Weinberger <ri...@no...> Cc: use...@li... Cc: Mikulas Patocka <mi...@ar...> Cc: jfs...@li... Cc: David Woodhouse <dw...@in...> Cc: lin...@li... Cc: Joern Engel <jo...@lo...> Cc: Prasad Joshi <pra...@gm...> Cc: lo...@lo... Cc: lin...@vg... Cc: Bob Copeland <me...@bo...> Cc: lin...@li... Cc: rei...@vg... Cc: Christoph Hellwig <hc...@in...> Cc: Evgeniy Dushistov <dus...@ma...> --- fs/9p/vfs_addr.c | 4 ++-- fs/9p/vfs_file.c | 8 ++++---- fs/adfs/file.c | 4 ++-- fs/affs/file.c | 4 ++-- fs/bfs/file.c | 4 ++-- fs/exofs/file.c | 4 ++-- fs/ext2/file.c | 4 ++-- fs/ext3/file.c | 4 ++-- fs/f2fs/file.c | 4 ++-- fs/fat/file.c | 4 ++-- fs/hfs/inode.c | 4 ++-- fs/hfsplus/inode.c | 4 ++-- fs/hostfs/hostfs_kern.c | 4 ++-- fs/hpfs/file.c | 4 ++-- fs/jffs2/file.c | 8 ++++---- fs/jfs/file.c | 4 ++-- fs/logfs/file.c | 4 ++-- fs/minix/file.c | 4 ++-- fs/nilfs2/file.c | 4 ++-- fs/omfs/file.c | 4 ++-- fs/ramfs/file-mmu.c | 4 ++-- fs/ramfs/file-nommu.c | 4 ++-- fs/reiserfs/file.c | 4 ++-- fs/romfs/mmap-nommu.c | 2 +- fs/sysv/file.c | 4 ++-- fs/ufs/file.c | 4 ++-- 26 files changed, 55 insertions(+), 55 deletions(-) diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index e70f239..01c0673 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c @@ -249,8 +249,8 @@ static int v9fs_launder_page(struct page *page) * the VFS gets them, so this method should never be called. * * Direct IO is not 'yet' supported in the cached mode. Hence when - * this routine is called through generic_file_aio_read(), the read/write fails - * with an error. + * this routine is called through generic_file_read_iter(), the read/write + * fails with an error. * */ static ssize_t diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index c2483e9..2e9441d 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c @@ -746,8 +746,8 @@ const struct file_operations v9fs_cached_file_operations = { .llseek = generic_file_llseek, .read = v9fs_cached_file_read, .write = v9fs_cached_file_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .open = v9fs_file_open, .release = v9fs_dir_release, .lock = v9fs_file_lock, @@ -759,8 +759,8 @@ const struct file_operations v9fs_cached_file_operations_dotl = { .llseek = generic_file_llseek, .read = v9fs_cached_file_read, .write = v9fs_cached_file_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .open = v9fs_file_open, .release = v9fs_dir_release, .lock = v9fs_file_lock_dotl, diff --git a/fs/adfs/file.c b/fs/adfs/file.c index a36da53..da1e021 100644 --- a/fs/adfs/file.c +++ b/fs/adfs/file.c @@ -24,11 +24,11 @@ const struct file_operations adfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .splice_read = generic_file_splice_read, }; diff --git a/fs/affs/file.c b/fs/affs/file.c index af3261b..d09a2db 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -28,9 +28,9 @@ static int affs_file_release(struct inode *inode, struct file *filp); const struct file_operations affs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .open = affs_file_open, .release = affs_file_release, diff --git a/fs/bfs/file.c b/fs/bfs/file.c index ad3ea14..3d14806 100644 --- a/fs/bfs/file.c +++ b/fs/bfs/file.c @@ -24,9 +24,9 @@ const struct file_operations bfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, }; diff --git a/fs/exofs/file.c b/fs/exofs/file.c index 491c6c0..20564f8a 100644 --- a/fs/exofs/file.c +++ b/fs/exofs/file.c @@ -69,8 +69,8 @@ const struct file_operations exofs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .open = generic_file_open, .release = exofs_release_file, diff --git a/fs/ext2/file.c b/fs/ext2/file.c index a5b3a5d..6af043b 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -64,8 +64,8 @@ const struct file_operations ext2_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .unlocked_ioctl = ext2_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = ext2_compat_ioctl, diff --git a/fs/ext3/file.c b/fs/ext3/file.c index 25cb413..a796771 100644 --- a/fs/ext3/file.c +++ b/fs/ext3/file.c @@ -52,8 +52,8 @@ const struct file_operations ext3_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .unlocked_ioctl = ext3_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = ext3_compat_ioctl, diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index f9e085d..86d9c4b 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -624,8 +624,8 @@ const struct file_operations f2fs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .open = generic_file_open, .mmap = f2fs_file_mmap, .fsync = f2fs_sync_file, diff --git a/fs/fat/file.c b/fs/fat/file.c index a62e0ec..92d587b 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -164,8 +164,8 @@ const struct file_operations fat_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .release = fat_file_release, .unlocked_ioctl = fat_generic_ioctl, diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c index 2a87ba4..0db0679 100644 --- a/fs/hfs/inode.c +++ b/fs/hfs/inode.c @@ -666,9 +666,9 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end, static const struct file_operations hfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, .fsync = hfs_file_fsync, diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index c87b26c..9b8cdb6 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c @@ -373,9 +373,9 @@ static const struct inode_operations hfsplus_file_inode_operations = { static const struct file_operations hfsplus_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, .fsync = hfsplus_file_fsync, diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 457addc..4593a9a 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -382,8 +382,8 @@ static const struct file_operations hostfs_file_fops = { .llseek = generic_file_llseek, .read = do_sync_read, .splice_read = generic_file_splice_read, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .write = do_sync_write, .mmap = generic_file_mmap, .open = hostfs_file_open, diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c index fbfe2df..efc8cd9 100644 --- a/fs/hpfs/file.c +++ b/fs/hpfs/file.c @@ -162,9 +162,9 @@ const struct file_operations hpfs_file_ops = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = hpfs_file_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .release = hpfs_file_release, .fsync = hpfs_file_fsync, diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index 1506673..1d7ab8b 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c @@ -51,10 +51,10 @@ const struct file_operations jffs2_file_operations = { .llseek = generic_file_llseek, .open = generic_file_open, - .read = do_sync_read, - .aio_read = generic_file_aio_read, - .write = do_sync_write, - .aio_write = generic_file_aio_write, + .read = do_sync_read, + .read_iter = generic_file_read_iter, + .write = do_sync_write, + .write_iter = generic_file_write_iter, .unlocked_ioctl=jffs2_ioctl, .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, diff --git a/fs/jfs/file.c b/fs/jfs/file.c index dd7442c..040b6c7 100644 --- a/fs/jfs/file.c +++ b/fs/jfs/file.c @@ -151,8 +151,8 @@ const struct file_operations jfs_file_operations = { .llseek = generic_file_llseek, .write = do_sync_write, .read = do_sync_read, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, diff --git a/fs/logfs/file.c b/fs/logfs/file.c index 3886cde..ca35c88 100644 --- a/fs/logfs/file.c +++ b/fs/logfs/file.c @@ -263,8 +263,8 @@ const struct inode_operations logfs_reg_iops = { }; const struct file_operations logfs_reg_fops = { - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .fsync = logfs_fsync, .unlocked_ioctl = logfs_ioctl, .llseek = generic_file_llseek, diff --git a/fs/minix/file.c b/fs/minix/file.c index adc6f54..346d8f37 100644 --- a/fs/minix/file.c +++ b/fs/minix/file.c @@ -15,9 +15,9 @@ const struct file_operations minix_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c index 6194688..3e4337e 100644 --- a/fs/nilfs2/file.c +++ b/fs/nilfs2/file.c @@ -153,8 +153,8 @@ const struct file_operations nilfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .unlocked_ioctl = nilfs_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = nilfs_compat_ioctl, diff --git a/fs/omfs/file.c b/fs/omfs/file.c index e0d9b3e..badafd8 100644 --- a/fs/omfs/file.c +++ b/fs/omfs/file.c @@ -339,8 +339,8 @@ const struct file_operations omfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c index 4884ac5..c4d8572 100644 --- a/fs/ramfs/file-mmu.c +++ b/fs/ramfs/file-mmu.c @@ -39,9 +39,9 @@ const struct address_space_operations ramfs_aops = { const struct file_operations ramfs_file_operations = { .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = noop_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c index d5378d0..1d6be6c 100644 --- a/fs/ramfs/file-nommu.c +++ b/fs/ramfs/file-nommu.c @@ -39,9 +39,9 @@ const struct file_operations ramfs_file_operations = { .mmap = ramfs_nommu_mmap, .get_unmapped_area = ramfs_nommu_get_unmapped_area, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .fsync = noop_fsync, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index 50302d6..831703d 100644 --- a/fs/reiserfs/file.c +++ b/fs/reiserfs/file.c @@ -304,8 +304,8 @@ const struct file_operations reiserfs_file_operations = { .open = reiserfs_file_open, .release = reiserfs_file_release, .fsync = reiserfs_sync_file, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, diff --git a/fs/romfs/mmap-nommu.c b/fs/romfs/mmap-nommu.c index e1a7779..e34d51a 100644 --- a/fs/romfs/mmap-nommu.c +++ b/fs/romfs/mmap-nommu.c @@ -70,7 +70,7 @@ static int romfs_mmap(struct file *file, struct vm_area_struct *vma) const struct file_operations romfs_ro_fops = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .splice_read = generic_file_splice_read, .mmap = romfs_mmap, .get_unmapped_area = romfs_get_unmapped_area, diff --git a/fs/sysv/file.c b/fs/sysv/file.c index 9d4dc68..ff4b363 100644 --- a/fs/sysv/file.c +++ b/fs/sysv/file.c @@ -22,9 +22,9 @@ const struct file_operations sysv_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/ufs/file.c b/fs/ufs/file.c index 33afa20..e155e4c 100644 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c @@ -36,9 +36,9 @@ const struct file_operations ufs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .open = generic_file_open, .fsync = generic_file_fsync, -- 1.8.1 |
From: Boaz H. <bha...@pa...> - 2013-01-10 12:42:10
|
On 01/09/2013 09:58 PM, Dave Kleikamp wrote: > These are the simple ones. > > File systems that use generic_file_aio_read() and generic_file_aio_write() > can trivially support generic_file_read_iter() and generic_file_write_iter(). > > This patch adds those file_operations for 9p, adfs, affs, bfs, exofs, ext2, > ext3, fat, f2fs, hfs, hfsplus, hostfs, hpfs, jfs, jffs2, logfs, minix, nilfs2, > omfs, ramfs, reiserfs, romfs, sysv, and ufs. > > Signed-off-by: Dave Kleikamp <dav...@or...> > Cc: Zach Brown <za...@za...> > Cc: v9f...@li... > Cc: Tigran A. Aivazian <ti...@ai...> > Cc: Jan Kara <ja...@su...> > Cc: Andrew Morton <ak...@li...> > Cc: Andreas Dilger <adi...@di...> > Cc: lin...@vg... > Cc: OGAWA Hirofumi <hir...@ma...> Thanks looks good. ACK-by: Boaz Harrosh <bha...@pa...> > Cc: Boaz Harrosh <bha...@pa...> > Cc: Benny Halevy <bh...@to...> > Cc: os...@op... > Cc: Jeff Dike <jd...@ad...> > Cc: Richard Weinberger <ri...@no...> > Cc: use...@li... > Cc: Mikulas Patocka <mi...@ar...> > Cc: jfs...@li... > Cc: David Woodhouse <dw...@in...> > Cc: lin...@li... > Cc: Joern Engel <jo...@lo...> > Cc: Prasad Joshi <pra...@gm...> > Cc: lo...@lo... > Cc: lin...@vg... > Cc: Bob Copeland <me...@bo...> > Cc: lin...@li... > Cc: rei...@vg... > Cc: Christoph Hellwig <hc...@in...> > Cc: Evgeniy Dushistov <dus...@ma...> > --- > fs/9p/vfs_addr.c | 4 ++-- > fs/9p/vfs_file.c | 8 ++++---- > fs/adfs/file.c | 4 ++-- > fs/affs/file.c | 4 ++-- > fs/bfs/file.c | 4 ++-- > fs/exofs/file.c | 4 ++-- > fs/ext2/file.c | 4 ++-- > fs/ext3/file.c | 4 ++-- > fs/f2fs/file.c | 4 ++-- > fs/fat/file.c | 4 ++-- > fs/hfs/inode.c | 4 ++-- > fs/hfsplus/inode.c | 4 ++-- > fs/hostfs/hostfs_kern.c | 4 ++-- > fs/hpfs/file.c | 4 ++-- > fs/jffs2/file.c | 8 ++++---- > fs/jfs/file.c | 4 ++-- > fs/logfs/file.c | 4 ++-- > fs/minix/file.c | 4 ++-- > fs/nilfs2/file.c | 4 ++-- > fs/omfs/file.c | 4 ++-- > fs/ramfs/file-mmu.c | 4 ++-- > fs/ramfs/file-nommu.c | 4 ++-- > fs/reiserfs/file.c | 4 ++-- > fs/romfs/mmap-nommu.c | 2 +- > fs/sysv/file.c | 4 ++-- > fs/ufs/file.c | 4 ++-- > 26 files changed, 55 insertions(+), 55 deletions(-) > > diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c > index e70f239..01c0673 100644 > --- a/fs/9p/vfs_addr.c > +++ b/fs/9p/vfs_addr.c > @@ -249,8 +249,8 @@ static int v9fs_launder_page(struct page *page) > * the VFS gets them, so this method should never be called. > * > * Direct IO is not 'yet' supported in the cached mode. Hence when > - * this routine is called through generic_file_aio_read(), the read/write fails > - * with an error. > + * this routine is called through generic_file_read_iter(), the read/write > + * fails with an error. > * > */ > static ssize_t > diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c > index c2483e9..2e9441d 100644 > --- a/fs/9p/vfs_file.c > +++ b/fs/9p/vfs_file.c > @@ -746,8 +746,8 @@ const struct file_operations v9fs_cached_file_operations = { > .llseek = generic_file_llseek, > .read = v9fs_cached_file_read, > .write = v9fs_cached_file_write, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .open = v9fs_file_open, > .release = v9fs_dir_release, > .lock = v9fs_file_lock, > @@ -759,8 +759,8 @@ const struct file_operations v9fs_cached_file_operations_dotl = { > .llseek = generic_file_llseek, > .read = v9fs_cached_file_read, > .write = v9fs_cached_file_write, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .open = v9fs_file_open, > .release = v9fs_dir_release, > .lock = v9fs_file_lock_dotl, > diff --git a/fs/adfs/file.c b/fs/adfs/file.c > index a36da53..da1e021 100644 > --- a/fs/adfs/file.c > +++ b/fs/adfs/file.c > @@ -24,11 +24,11 @@ > const struct file_operations adfs_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .mmap = generic_file_mmap, > .fsync = generic_file_fsync, > .write = do_sync_write, > - .aio_write = generic_file_aio_write, > + .write_iter = generic_file_write_iter, > .splice_read = generic_file_splice_read, > }; > > diff --git a/fs/affs/file.c b/fs/affs/file.c > index af3261b..d09a2db 100644 > --- a/fs/affs/file.c > +++ b/fs/affs/file.c > @@ -28,9 +28,9 @@ static int affs_file_release(struct inode *inode, struct file *filp); > const struct file_operations affs_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .write = do_sync_write, > - .aio_write = generic_file_aio_write, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .open = affs_file_open, > .release = affs_file_release, > diff --git a/fs/bfs/file.c b/fs/bfs/file.c > index ad3ea14..3d14806 100644 > --- a/fs/bfs/file.c > +++ b/fs/bfs/file.c > @@ -24,9 +24,9 @@ > const struct file_operations bfs_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .write = do_sync_write, > - .aio_write = generic_file_aio_write, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .splice_read = generic_file_splice_read, > }; > diff --git a/fs/exofs/file.c b/fs/exofs/file.c > index 491c6c0..20564f8a 100644 > --- a/fs/exofs/file.c > +++ b/fs/exofs/file.c > @@ -69,8 +69,8 @@ const struct file_operations exofs_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > .write = do_sync_write, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .open = generic_file_open, > .release = exofs_release_file, > diff --git a/fs/ext2/file.c b/fs/ext2/file.c > index a5b3a5d..6af043b 100644 > --- a/fs/ext2/file.c > +++ b/fs/ext2/file.c > @@ -64,8 +64,8 @@ const struct file_operations ext2_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > .write = do_sync_write, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .unlocked_ioctl = ext2_ioctl, > #ifdef CONFIG_COMPAT > .compat_ioctl = ext2_compat_ioctl, > diff --git a/fs/ext3/file.c b/fs/ext3/file.c > index 25cb413..a796771 100644 > --- a/fs/ext3/file.c > +++ b/fs/ext3/file.c > @@ -52,8 +52,8 @@ const struct file_operations ext3_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > .write = do_sync_write, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .unlocked_ioctl = ext3_ioctl, > #ifdef CONFIG_COMPAT > .compat_ioctl = ext3_compat_ioctl, > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index f9e085d..86d9c4b 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -624,8 +624,8 @@ const struct file_operations f2fs_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > .write = do_sync_write, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .open = generic_file_open, > .mmap = f2fs_file_mmap, > .fsync = f2fs_sync_file, > diff --git a/fs/fat/file.c b/fs/fat/file.c > index a62e0ec..92d587b 100644 > --- a/fs/fat/file.c > +++ b/fs/fat/file.c > @@ -164,8 +164,8 @@ const struct file_operations fat_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > .write = do_sync_write, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .release = fat_file_release, > .unlocked_ioctl = fat_generic_ioctl, > diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c > index 2a87ba4..0db0679 100644 > --- a/fs/hfs/inode.c > +++ b/fs/hfs/inode.c > @@ -666,9 +666,9 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end, > static const struct file_operations hfs_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .write = do_sync_write, > - .aio_write = generic_file_aio_write, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .splice_read = generic_file_splice_read, > .fsync = hfs_file_fsync, > diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c > index c87b26c..9b8cdb6 100644 > --- a/fs/hfsplus/inode.c > +++ b/fs/hfsplus/inode.c > @@ -373,9 +373,9 @@ static const struct inode_operations hfsplus_file_inode_operations = { > static const struct file_operations hfsplus_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .write = do_sync_write, > - .aio_write = generic_file_aio_write, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .splice_read = generic_file_splice_read, > .fsync = hfsplus_file_fsync, > diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c > index 457addc..4593a9a 100644 > --- a/fs/hostfs/hostfs_kern.c > +++ b/fs/hostfs/hostfs_kern.c > @@ -382,8 +382,8 @@ static const struct file_operations hostfs_file_fops = { > .llseek = generic_file_llseek, > .read = do_sync_read, > .splice_read = generic_file_splice_read, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .write = do_sync_write, > .mmap = generic_file_mmap, > .open = hostfs_file_open, > diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c > index fbfe2df..efc8cd9 100644 > --- a/fs/hpfs/file.c > +++ b/fs/hpfs/file.c > @@ -162,9 +162,9 @@ const struct file_operations hpfs_file_ops = > { > .llseek = generic_file_llseek, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .write = hpfs_file_write, > - .aio_write = generic_file_aio_write, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .release = hpfs_file_release, > .fsync = hpfs_file_fsync, > diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c > index 1506673..1d7ab8b 100644 > --- a/fs/jffs2/file.c > +++ b/fs/jffs2/file.c > @@ -51,10 +51,10 @@ const struct file_operations jffs2_file_operations = > { > .llseek = generic_file_llseek, > .open = generic_file_open, > - .read = do_sync_read, > - .aio_read = generic_file_aio_read, > - .write = do_sync_write, > - .aio_write = generic_file_aio_write, > + .read = do_sync_read, > + .read_iter = generic_file_read_iter, > + .write = do_sync_write, > + .write_iter = generic_file_write_iter, > .unlocked_ioctl=jffs2_ioctl, > .mmap = generic_file_readonly_mmap, > .fsync = jffs2_fsync, > diff --git a/fs/jfs/file.c b/fs/jfs/file.c > index dd7442c..040b6c7 100644 > --- a/fs/jfs/file.c > +++ b/fs/jfs/file.c > @@ -151,8 +151,8 @@ const struct file_operations jfs_file_operations = { > .llseek = generic_file_llseek, > .write = do_sync_write, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .splice_read = generic_file_splice_read, > .splice_write = generic_file_splice_write, > diff --git a/fs/logfs/file.c b/fs/logfs/file.c > index 3886cde..ca35c88 100644 > --- a/fs/logfs/file.c > +++ b/fs/logfs/file.c > @@ -263,8 +263,8 @@ const struct inode_operations logfs_reg_iops = { > }; > > const struct file_operations logfs_reg_fops = { > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .fsync = logfs_fsync, > .unlocked_ioctl = logfs_ioctl, > .llseek = generic_file_llseek, > diff --git a/fs/minix/file.c b/fs/minix/file.c > index adc6f54..346d8f37 100644 > --- a/fs/minix/file.c > +++ b/fs/minix/file.c > @@ -15,9 +15,9 @@ > const struct file_operations minix_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .write = do_sync_write, > - .aio_write = generic_file_aio_write, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .fsync = generic_file_fsync, > .splice_read = generic_file_splice_read, > diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c > index 6194688..3e4337e 100644 > --- a/fs/nilfs2/file.c > +++ b/fs/nilfs2/file.c > @@ -153,8 +153,8 @@ const struct file_operations nilfs_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > .write = do_sync_write, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .unlocked_ioctl = nilfs_ioctl, > #ifdef CONFIG_COMPAT > .compat_ioctl = nilfs_compat_ioctl, > diff --git a/fs/omfs/file.c b/fs/omfs/file.c > index e0d9b3e..badafd8 100644 > --- a/fs/omfs/file.c > +++ b/fs/omfs/file.c > @@ -339,8 +339,8 @@ const struct file_operations omfs_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > .write = do_sync_write, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .fsync = generic_file_fsync, > .splice_read = generic_file_splice_read, > diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c > index 4884ac5..c4d8572 100644 > --- a/fs/ramfs/file-mmu.c > +++ b/fs/ramfs/file-mmu.c > @@ -39,9 +39,9 @@ const struct address_space_operations ramfs_aops = { > > const struct file_operations ramfs_file_operations = { > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .write = do_sync_write, > - .aio_write = generic_file_aio_write, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .fsync = noop_fsync, > .splice_read = generic_file_splice_read, > diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c > index d5378d0..1d6be6c 100644 > --- a/fs/ramfs/file-nommu.c > +++ b/fs/ramfs/file-nommu.c > @@ -39,9 +39,9 @@ const struct file_operations ramfs_file_operations = { > .mmap = ramfs_nommu_mmap, > .get_unmapped_area = ramfs_nommu_get_unmapped_area, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .write = do_sync_write, > - .aio_write = generic_file_aio_write, > + .write_iter = generic_file_write_iter, > .fsync = noop_fsync, > .splice_read = generic_file_splice_read, > .splice_write = generic_file_splice_write, > diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c > index 50302d6..831703d 100644 > --- a/fs/reiserfs/file.c > +++ b/fs/reiserfs/file.c > @@ -304,8 +304,8 @@ const struct file_operations reiserfs_file_operations = { > .open = reiserfs_file_open, > .release = reiserfs_file_release, > .fsync = reiserfs_sync_file, > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, > .splice_read = generic_file_splice_read, > .splice_write = generic_file_splice_write, > .llseek = generic_file_llseek, > diff --git a/fs/romfs/mmap-nommu.c b/fs/romfs/mmap-nommu.c > index e1a7779..e34d51a 100644 > --- a/fs/romfs/mmap-nommu.c > +++ b/fs/romfs/mmap-nommu.c > @@ -70,7 +70,7 @@ static int romfs_mmap(struct file *file, struct vm_area_struct *vma) > const struct file_operations romfs_ro_fops = { > .llseek = generic_file_llseek, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .splice_read = generic_file_splice_read, > .mmap = romfs_mmap, > .get_unmapped_area = romfs_get_unmapped_area, > diff --git a/fs/sysv/file.c b/fs/sysv/file.c > index 9d4dc68..ff4b363 100644 > --- a/fs/sysv/file.c > +++ b/fs/sysv/file.c > @@ -22,9 +22,9 @@ > const struct file_operations sysv_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .write = do_sync_write, > - .aio_write = generic_file_aio_write, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .fsync = generic_file_fsync, > .splice_read = generic_file_splice_read, > diff --git a/fs/ufs/file.c b/fs/ufs/file.c > index 33afa20..e155e4c 100644 > --- a/fs/ufs/file.c > +++ b/fs/ufs/file.c > @@ -36,9 +36,9 @@ > const struct file_operations ufs_file_operations = { > .llseek = generic_file_llseek, > .read = do_sync_read, > - .aio_read = generic_file_aio_read, > + .read_iter = generic_file_read_iter, > .write = do_sync_write, > - .aio_write = generic_file_aio_write, > + .write_iter = generic_file_write_iter, > .mmap = generic_file_mmap, > .open = generic_file_open, > .fsync = generic_file_fsync, > |
From: Dave K. <dav...@or...> - 2013-01-29 16:25:04
|
These are the simple ones. File systems that use generic_file_aio_read() and generic_file_aio_write() can trivially support generic_file_read_iter() and generic_file_write_iter(). This patch adds those file_operations for 9p, adfs, affs, bfs, exofs, ext2, ext3, fat, f2fs, hfs, hfsplus, hostfs, hpfs, jfs, jffs2, logfs, minix, nilfs2, omfs, ramfs, reiserfs, romfs, sysv, and ufs. Signed-off-by: Dave Kleikamp <dav...@or...> Acked-by: Boaz Harrosh <bha...@pa...> Cc: Zach Brown <za...@za...> Cc: v9f...@li... Cc: Tigran A. Aivazian <ti...@ai...> Cc: Jan Kara <ja...@su...> Cc: Andrew Morton <ak...@li...> Cc: Andreas Dilger <adi...@di...> Cc: lin...@vg... Cc: OGAWA Hirofumi <hir...@ma...> Cc: Benny Halevy <bh...@to...> Cc: os...@op... Cc: Jeff Dike <jd...@ad...> Cc: Richard Weinberger <ri...@no...> Cc: use...@li... Cc: Mikulas Patocka <mi...@ar...> Cc: jfs...@li... Cc: David Woodhouse <dw...@in...> Cc: lin...@li... Cc: Joern Engel <jo...@lo...> Cc: Prasad Joshi <pra...@gm...> Cc: lo...@lo... Cc: lin...@vg... Cc: Bob Copeland <me...@bo...> Cc: lin...@li... Cc: rei...@vg... Cc: Christoph Hellwig <hc...@in...> Cc: Evgeniy Dushistov <dus...@ma...> --- fs/9p/vfs_addr.c | 4 ++-- fs/9p/vfs_file.c | 8 ++++---- fs/adfs/file.c | 4 ++-- fs/affs/file.c | 4 ++-- fs/bfs/file.c | 4 ++-- fs/exofs/file.c | 4 ++-- fs/ext2/file.c | 4 ++-- fs/ext3/file.c | 4 ++-- fs/f2fs/file.c | 4 ++-- fs/fat/file.c | 4 ++-- fs/hfs/inode.c | 4 ++-- fs/hfsplus/inode.c | 4 ++-- fs/hostfs/hostfs_kern.c | 4 ++-- fs/hpfs/file.c | 4 ++-- fs/jffs2/file.c | 8 ++++---- fs/jfs/file.c | 4 ++-- fs/logfs/file.c | 4 ++-- fs/minix/file.c | 4 ++-- fs/nilfs2/file.c | 4 ++-- fs/omfs/file.c | 4 ++-- fs/ramfs/file-mmu.c | 4 ++-- fs/ramfs/file-nommu.c | 4 ++-- fs/reiserfs/file.c | 4 ++-- fs/romfs/mmap-nommu.c | 2 +- fs/sysv/file.c | 4 ++-- fs/ufs/file.c | 4 ++-- 26 files changed, 55 insertions(+), 55 deletions(-) diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c index e70f239..01c0673 100644 --- a/fs/9p/vfs_addr.c +++ b/fs/9p/vfs_addr.c @@ -249,8 +249,8 @@ static int v9fs_launder_page(struct page *page) * the VFS gets them, so this method should never be called. * * Direct IO is not 'yet' supported in the cached mode. Hence when - * this routine is called through generic_file_aio_read(), the read/write fails - * with an error. + * this routine is called through generic_file_read_iter(), the read/write + * fails with an error. * */ static ssize_t diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c index c2483e9..2e9441d 100644 --- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c @@ -746,8 +746,8 @@ const struct file_operations v9fs_cached_file_operations = { .llseek = generic_file_llseek, .read = v9fs_cached_file_read, .write = v9fs_cached_file_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .open = v9fs_file_open, .release = v9fs_dir_release, .lock = v9fs_file_lock, @@ -759,8 +759,8 @@ const struct file_operations v9fs_cached_file_operations_dotl = { .llseek = generic_file_llseek, .read = v9fs_cached_file_read, .write = v9fs_cached_file_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .open = v9fs_file_open, .release = v9fs_dir_release, .lock = v9fs_file_lock_dotl, diff --git a/fs/adfs/file.c b/fs/adfs/file.c index a36da53..da1e021 100644 --- a/fs/adfs/file.c +++ b/fs/adfs/file.c @@ -24,11 +24,11 @@ const struct file_operations adfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .splice_read = generic_file_splice_read, }; diff --git a/fs/affs/file.c b/fs/affs/file.c index af3261b..d09a2db 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -28,9 +28,9 @@ static int affs_file_release(struct inode *inode, struct file *filp); const struct file_operations affs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .open = affs_file_open, .release = affs_file_release, diff --git a/fs/bfs/file.c b/fs/bfs/file.c index ad3ea14..3d14806 100644 --- a/fs/bfs/file.c +++ b/fs/bfs/file.c @@ -24,9 +24,9 @@ const struct file_operations bfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, }; diff --git a/fs/exofs/file.c b/fs/exofs/file.c index 491c6c0..20564f8a 100644 --- a/fs/exofs/file.c +++ b/fs/exofs/file.c @@ -69,8 +69,8 @@ const struct file_operations exofs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .open = generic_file_open, .release = exofs_release_file, diff --git a/fs/ext2/file.c b/fs/ext2/file.c index a5b3a5d..6af043b 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -64,8 +64,8 @@ const struct file_operations ext2_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .unlocked_ioctl = ext2_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = ext2_compat_ioctl, diff --git a/fs/ext3/file.c b/fs/ext3/file.c index 25cb413..a796771 100644 --- a/fs/ext3/file.c +++ b/fs/ext3/file.c @@ -52,8 +52,8 @@ const struct file_operations ext3_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .unlocked_ioctl = ext3_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = ext3_compat_ioctl, diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 3191b52..d636c4e 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -634,8 +634,8 @@ const struct file_operations f2fs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .open = generic_file_open, .mmap = f2fs_file_mmap, .fsync = f2fs_sync_file, diff --git a/fs/fat/file.c b/fs/fat/file.c index a62e0ec..92d587b 100644 --- a/fs/fat/file.c +++ b/fs/fat/file.c @@ -164,8 +164,8 @@ const struct file_operations fat_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .release = fat_file_release, .unlocked_ioctl = fat_generic_ioctl, diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c index 2a87ba4..0db0679 100644 --- a/fs/hfs/inode.c +++ b/fs/hfs/inode.c @@ -666,9 +666,9 @@ static int hfs_file_fsync(struct file *filp, loff_t start, loff_t end, static const struct file_operations hfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, .fsync = hfs_file_fsync, diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index c87b26c..9b8cdb6 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c @@ -373,9 +373,9 @@ static const struct inode_operations hfsplus_file_inode_operations = { static const struct file_operations hfsplus_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, .fsync = hfsplus_file_fsync, diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 457addc..4593a9a 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -382,8 +382,8 @@ static const struct file_operations hostfs_file_fops = { .llseek = generic_file_llseek, .read = do_sync_read, .splice_read = generic_file_splice_read, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .write = do_sync_write, .mmap = generic_file_mmap, .open = hostfs_file_open, diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c index fbfe2df..efc8cd9 100644 --- a/fs/hpfs/file.c +++ b/fs/hpfs/file.c @@ -162,9 +162,9 @@ const struct file_operations hpfs_file_ops = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = hpfs_file_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .release = hpfs_file_release, .fsync = hpfs_file_fsync, diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index 1506673..1d7ab8b 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c @@ -51,10 +51,10 @@ const struct file_operations jffs2_file_operations = { .llseek = generic_file_llseek, .open = generic_file_open, - .read = do_sync_read, - .aio_read = generic_file_aio_read, - .write = do_sync_write, - .aio_write = generic_file_aio_write, + .read = do_sync_read, + .read_iter = generic_file_read_iter, + .write = do_sync_write, + .write_iter = generic_file_write_iter, .unlocked_ioctl=jffs2_ioctl, .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, diff --git a/fs/jfs/file.c b/fs/jfs/file.c index dd7442c..040b6c7 100644 --- a/fs/jfs/file.c +++ b/fs/jfs/file.c @@ -151,8 +151,8 @@ const struct file_operations jfs_file_operations = { .llseek = generic_file_llseek, .write = do_sync_write, .read = do_sync_read, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, diff --git a/fs/logfs/file.c b/fs/logfs/file.c index 3886cde..ca35c88 100644 --- a/fs/logfs/file.c +++ b/fs/logfs/file.c @@ -263,8 +263,8 @@ const struct inode_operations logfs_reg_iops = { }; const struct file_operations logfs_reg_fops = { - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .fsync = logfs_fsync, .unlocked_ioctl = logfs_ioctl, .llseek = generic_file_llseek, diff --git a/fs/minix/file.c b/fs/minix/file.c index adc6f54..346d8f37 100644 --- a/fs/minix/file.c +++ b/fs/minix/file.c @@ -15,9 +15,9 @@ const struct file_operations minix_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c index 6194688..3e4337e 100644 --- a/fs/nilfs2/file.c +++ b/fs/nilfs2/file.c @@ -153,8 +153,8 @@ const struct file_operations nilfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .unlocked_ioctl = nilfs_ioctl, #ifdef CONFIG_COMPAT .compat_ioctl = nilfs_compat_ioctl, diff --git a/fs/omfs/file.c b/fs/omfs/file.c index e0d9b3e..badafd8 100644 --- a/fs/omfs/file.c +++ b/fs/omfs/file.c @@ -339,8 +339,8 @@ const struct file_operations omfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c index 4884ac5..c4d8572 100644 --- a/fs/ramfs/file-mmu.c +++ b/fs/ramfs/file-mmu.c @@ -39,9 +39,9 @@ const struct address_space_operations ramfs_aops = { const struct file_operations ramfs_file_operations = { .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = noop_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c index d5378d0..1d6be6c 100644 --- a/fs/ramfs/file-nommu.c +++ b/fs/ramfs/file-nommu.c @@ -39,9 +39,9 @@ const struct file_operations ramfs_file_operations = { .mmap = ramfs_nommu_mmap, .get_unmapped_area = ramfs_nommu_get_unmapped_area, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .fsync = noop_fsync, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index 50302d6..831703d 100644 --- a/fs/reiserfs/file.c +++ b/fs/reiserfs/file.c @@ -304,8 +304,8 @@ const struct file_operations reiserfs_file_operations = { .open = reiserfs_file_open, .release = reiserfs_file_release, .fsync = reiserfs_sync_file, - .aio_read = generic_file_aio_read, - .aio_write = generic_file_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = generic_file_write_iter, .splice_read = generic_file_splice_read, .splice_write = generic_file_splice_write, .llseek = generic_file_llseek, diff --git a/fs/romfs/mmap-nommu.c b/fs/romfs/mmap-nommu.c index e1a7779..e34d51a 100644 --- a/fs/romfs/mmap-nommu.c +++ b/fs/romfs/mmap-nommu.c @@ -70,7 +70,7 @@ static int romfs_mmap(struct file *file, struct vm_area_struct *vma) const struct file_operations romfs_ro_fops = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .splice_read = generic_file_splice_read, .mmap = romfs_mmap, .get_unmapped_area = romfs_get_unmapped_area, diff --git a/fs/sysv/file.c b/fs/sysv/file.c index 9d4dc68..ff4b363 100644 --- a/fs/sysv/file.c +++ b/fs/sysv/file.c @@ -22,9 +22,9 @@ const struct file_operations sysv_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, diff --git a/fs/ufs/file.c b/fs/ufs/file.c index 33afa20..e155e4c 100644 --- a/fs/ufs/file.c +++ b/fs/ufs/file.c @@ -36,9 +36,9 @@ const struct file_operations ufs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .mmap = generic_file_mmap, .open = generic_file_open, .fsync = generic_file_fsync, -- 1.8.1.1 |
From: Artem B. <ded...@gm...> - 2013-02-01 08:24:03
Attachments:
signature.asc
|
On Tue, 2013-01-29 at 10:23 -0600, Dave Kleikamp wrote: > - .aio_read = generic_file_aio_read, > - .aio_write = generic_file_aio_write, > + .read_iter = generic_file_read_iter, > + .write_iter = generic_file_write_iter, The new names a lot less self-documenting than the old ones - I read them as "read iteration", because "iter" is often used for "iteration", and this gives me no clue that they are related to AIO... I apologize if this was already discussed, but why did you choose "iter"? -- Best Regards, Artem Bityutskiy |
From: Dave K. <dav...@or...> - 2013-02-01 20:41:44
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 02/01/2013 01:51 AM, Artem Bityutskiy wrote: > On Tue, 2013-01-29 at 10:23 -0600, Dave Kleikamp wrote: >> - .aio_read = generic_file_aio_read, - .aio_write = >> generic_file_aio_write, + .read_iter = >> generic_file_read_iter, + .write_iter = >> generic_file_write_iter, > > The new names a lot less self-documenting than the old ones - I > read them as "read iteration", because "iter" is often used for > "iteration", and this gives me no clue that they are related to > AIO... Zach Brown originally came up with these (or at least he's the one who did the majority of the initial work with this patchset) and I can't speak for him, but I'm not sure if I could come up with a better name. (Maybe aio_read_iter/aio_write_iter?) These operations are differentiated from aio_read/write because they take the iov_iter argument rather than an iovec, so "iter" does seem appropriate. > I apologize if this was already discussed, but why did you choose > "iter"? It hasn't been discussed, but nobody has said anything about the names until now. I hesitate to change the proposed names now unless there's some kind of consensus to do so. If others chime in and want me to change these to aio_read_iter and aio_write_iter or something else, I'll consider it. Thanks, Shaggy -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRDChYAAoJEDaohF61QIxkRAkP/0HRsRwVPU/mKJx3BSlw44st sWrbKNPhVaMpHQtJP+w7CisgwC/PzP0mi6wV5FyQ0ZmUkMEkWJ1Eog8QExCNKnih VLBsWTBYLmVWQhRzuO6K91H2/n3rkTN2f5s0CT6bgDvBnme295UrRCpb5Yb5r/Xr eW16lX+4W8G5tEfDCKpvtzr0zSpxzIt5S8CsQEAaeVuskfZ+s/UKDjLUtQi4H2jP MVJNBrXzJ4zlDPIRXrh3PPfcG1ii2ai9+3UQChWw5XGhln4ttmh5GT9PHEyznizM iSn9DYUxa3OPJCwx759eZAUzK/s4es/S9vwg1psJqBU6nIIcl9UQRQhbNdywoqQ5 N6JmSXF8oToTH4HTBc4K32zJ1P9qi2oQeVu1Jzdpoz6v8XgJGUnrkoceVgQTjJRF H1kramDQB6zwzfCmYlZniAhP1LcbZ6ON/GgpdtOwl2q++gHO9+e5LGIDJNMhd3Kc MJ3jJXDvy5Flsi9qY4h7Mh7hdpQAmF4ZpMXRlHtHFPlK3RvjDoW5UwBcjGiulVYt 9tx9hhLHztBe1Fs9b1GbUDTs2fZHH4g75+pSUfQgyPhk6DNz21KBA1eClC0JZpYK UYFpnUf4p9aYK3WwB+nrchASmiWYisxL7xTQKCn2NVCG48XpDjtJj8dQGvcgBG9n YS/fnE0ljbrWW4W+yZG5 =VJcR -----END PGP SIGNATURE----- |