switch simple generic_file_aio_read() users to ->read_iter()

tjh.dev / kernel

fork atom

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

kernel os linux

fork atom

switch simple generic_file_aio_read() users to ->read_iter()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 12 years ago aad4f8bb 293bc982

+75 -75

35 changed files

expand all collapse all

drivers

char

raw.c

vfs_file.c

adfs

file.c

affs

file.c

afs

file.c

bfs

file.c

btrfs

file.c

cifs

cifsfs.c

exofs

file.c

ext2

file.c

ext3

file.c

ext4

file.c

f2fs

file.c

fat

file.c

gfs2

file.c

hfs

inode.c

hfsplus

inode.c

hostfs

hostfs_kern.c

hpfs

file.c

jffs2

file.c

jfs

file.c

logfs

file.c

minix

file.c

nilfs2

file.c

ntfs

file.c

omfs

file.c

ramfs

file-mmu.c

file-nommu.c

read_write.c

reiserfs

file.c

romfs

mmap-nommu.c

sysv

file.c

ubifs

file.c

udf

file.c

ufs

file.c

+2 -2

drivers/char/raw.c

reviewed

··· 284 284 #endif 285 285 286 286 static const struct file_operations raw_fops = { 287 287 - .read = do_sync_read, 288 288 - .aio_read = generic_file_aio_read, 287 287 + .read = new_sync_read, 288 288 + .read_iter = generic_file_read_iter, 289 289 .write = do_sync_write, 290 290 .aio_write = blkdev_aio_write, 291 291 .fsync = blkdev_fsync,

+3 -3

fs/9p/vfs_file.c

reviewed

··· 695 695 { 696 696 if (filp->f_flags & O_DIRECT) 697 697 return v9fs_direct_read(filp, data, count, offset); 698 698 - return do_sync_read(filp, data, count, offset); 698 698 + return new_sync_read(filp, data, count, offset); 699 699 } 700 700 701 701 /** ··· 850 850 .llseek = generic_file_llseek, 851 851 .read = v9fs_cached_file_read, 852 852 .write = v9fs_cached_file_write, 853 853 - .aio_read = generic_file_aio_read, 853 853 + .read_iter = generic_file_read_iter, 854 854 .aio_write = generic_file_aio_write, 855 855 .open = v9fs_file_open, 856 856 .release = v9fs_dir_release, ··· 863 863 .llseek = generic_file_llseek, 864 864 .read = v9fs_cached_file_read, 865 865 .write = v9fs_cached_file_write, 866 866 - .aio_read = generic_file_aio_read, 866 866 + .read_iter = generic_file_read_iter, 867 867 .aio_write = generic_file_aio_write, 868 868 .open = v9fs_file_open, 869 869 .release = v9fs_dir_release,

+2 -2

fs/adfs/file.c

reviewed

··· 23 23 24 24 const struct file_operations adfs_file_operations = { 25 25 .llseek = generic_file_llseek, 26 26 - .read = do_sync_read, 27 27 - .aio_read = generic_file_aio_read, 26 26 + .read = new_sync_read, 27 27 + .read_iter = generic_file_read_iter, 28 28 .mmap = generic_file_mmap, 29 29 .fsync = generic_file_fsync, 30 30 .write = do_sync_write,

+2 -2

fs/affs/file.c

reviewed

··· 27 27 28 28 const struct file_operations affs_file_operations = { 29 29 .llseek = generic_file_llseek, 30 30 - .read = do_sync_read, 31 31 - .aio_read = generic_file_aio_read, 30 30 + .read = new_sync_read, 31 31 + .read_iter = generic_file_read_iter, 32 32 .write = do_sync_write, 33 33 .aio_write = generic_file_aio_write, 34 34 .mmap = generic_file_mmap,

+2 -2

fs/afs/file.c

reviewed

··· 31 31 .open = afs_open, 32 32 .release = afs_release, 33 33 .llseek = generic_file_llseek, 34 34 - .read = do_sync_read, 34 34 + .read = new_sync_read, 35 35 .write = do_sync_write, 36 36 - .aio_read = generic_file_aio_read, 36 36 + .read_iter = generic_file_read_iter, 37 37 .aio_write = afs_file_write, 38 38 .mmap = generic_file_readonly_mmap, 39 39 .splice_read = generic_file_splice_read,

+2 -2

fs/bfs/file.c

reviewed

··· 23 23 24 24 const struct file_operations bfs_file_operations = { 25 25 .llseek = generic_file_llseek, 26 26 - .read = do_sync_read, 27 27 - .aio_read = generic_file_aio_read, 26 26 + .read = new_sync_read, 27 27 + .read_iter = generic_file_read_iter, 28 28 .write = do_sync_write, 29 29 .aio_write = generic_file_aio_write, 30 30 .mmap = generic_file_mmap,

+2 -2

fs/btrfs/file.c

reviewed

··· 2622 2622 2623 2623 const struct file_operations btrfs_file_operations = { 2624 2624 .llseek = btrfs_file_llseek, 2625 2625 - .read = do_sync_read, 2625 2625 + .read = new_sync_read, 2626 2626 .write = do_sync_write, 2627 2627 - .aio_read = generic_file_aio_read, 2627 2627 + .read_iter = generic_file_read_iter, 2628 2628 .splice_read = generic_file_splice_read, 2629 2629 .aio_write = btrfs_file_aio_write, 2630 2630 .mmap = btrfs_file_mmap,

+4 -4

fs/cifs/cifsfs.c

reviewed

··· 888 888 }; 889 889 890 890 const struct file_operations cifs_file_ops = { 891 891 - .read = do_sync_read, 891 891 + .read = new_sync_read, 892 892 .write = do_sync_write, 893 893 - .aio_read = generic_file_aio_read, 893 893 + .read_iter = generic_file_read_iter, 894 894 .aio_write = cifs_file_aio_write, 895 895 .open = cifs_open, 896 896 .release = cifs_close, ··· 946 946 }; 947 947 948 948 const struct file_operations cifs_file_nobrl_ops = { 949 949 - .read = do_sync_read, 949 949 + .read = new_sync_read, 950 950 .write = do_sync_write, 951 951 - .aio_read = generic_file_aio_read, 951 951 + .read_iter = generic_file_read_iter, 952 952 .aio_write = cifs_file_aio_write, 953 953 .open = cifs_open, 954 954 .release = cifs_close,

+2 -2

fs/exofs/file.c

reviewed

··· 67 67 68 68 const struct file_operations exofs_file_operations = { 69 69 .llseek = generic_file_llseek, 70 70 - .read = do_sync_read, 70 70 + .read = new_sync_read, 71 71 .write = do_sync_write, 72 72 - .aio_read = generic_file_aio_read, 72 72 + .read_iter = generic_file_read_iter, 73 73 .aio_write = generic_file_aio_write, 74 74 .mmap = generic_file_mmap, 75 75 .open = generic_file_open,

+2 -2

fs/ext2/file.c

reviewed

··· 62 62 */ 63 63 const struct file_operations ext2_file_operations = { 64 64 .llseek = generic_file_llseek, 65 65 - .read = do_sync_read, 65 65 + .read = new_sync_read, 66 66 .write = do_sync_write, 67 67 - .aio_read = generic_file_aio_read, 67 67 + .read_iter = generic_file_read_iter, 68 68 .aio_write = generic_file_aio_write, 69 69 .unlocked_ioctl = ext2_ioctl, 70 70 #ifdef CONFIG_COMPAT

+2 -2

fs/ext3/file.c

reviewed

··· 50 50 51 51 const struct file_operations ext3_file_operations = { 52 52 .llseek = generic_file_llseek, 53 53 - .read = do_sync_read, 53 53 + .read = new_sync_read, 54 54 .write = do_sync_write, 55 55 - .aio_read = generic_file_aio_read, 55 55 + .read_iter = generic_file_read_iter, 56 56 .aio_write = generic_file_aio_write, 57 57 .unlocked_ioctl = ext3_ioctl, 58 58 #ifdef CONFIG_COMPAT

+2 -2

fs/ext4/file.c

reviewed

··· 593 593 594 594 const struct file_operations ext4_file_operations = { 595 595 .llseek = ext4_llseek, 596 596 - .read = do_sync_read, 596 596 + .read = new_sync_read, 597 597 .write = do_sync_write, 598 598 - .aio_read = generic_file_aio_read, 598 598 + .read_iter = generic_file_read_iter, 599 599 .aio_write = ext4_file_write, 600 600 .unlocked_ioctl = ext4_ioctl, 601 601 #ifdef CONFIG_COMPAT

+2 -2

fs/f2fs/file.c

reviewed

··· 679 679 680 680 const struct file_operations f2fs_file_operations = { 681 681 .llseek = generic_file_llseek, 682 682 - .read = do_sync_read, 682 682 + .read = new_sync_read, 683 683 .write = do_sync_write, 684 684 - .aio_read = generic_file_aio_read, 684 684 + .read_iter = generic_file_read_iter, 685 685 .aio_write = generic_file_aio_write, 686 686 .open = generic_file_open, 687 687 .mmap = f2fs_file_mmap,

+2 -2

fs/fat/file.c

reviewed

··· 170 170 171 171 const struct file_operations fat_file_operations = { 172 172 .llseek = generic_file_llseek, 173 173 - .read = do_sync_read, 173 173 + .read = new_sync_read, 174 174 .write = do_sync_write, 175 175 - .aio_read = generic_file_aio_read, 175 175 + .read_iter = generic_file_read_iter, 176 176 .aio_write = generic_file_aio_write, 177 177 .mmap = generic_file_mmap, 178 178 .release = fat_file_release,

+4 -4

fs/gfs2/file.c

reviewed

··· 1058 1058 1059 1059 const struct file_operations gfs2_file_fops = { 1060 1060 .llseek = gfs2_llseek, 1061 1061 - .read = do_sync_read, 1062 1062 - .aio_read = generic_file_aio_read, 1061 1061 + .read = new_sync_read, 1062 1062 + .read_iter = generic_file_read_iter, 1063 1063 .write = do_sync_write, 1064 1064 .aio_write = gfs2_file_aio_write, 1065 1065 .unlocked_ioctl = gfs2_ioctl, ··· 1090 1090 1091 1091 const struct file_operations gfs2_file_fops_nolock = { 1092 1092 .llseek = gfs2_llseek, 1093 1093 - .read = do_sync_read, 1094 1094 - .aio_read = generic_file_aio_read, 1093 1093 + .read = new_sync_read, 1094 1094 + .read_iter = generic_file_read_iter, 1095 1095 .write = do_sync_write, 1096 1096 .aio_write = gfs2_file_aio_write, 1097 1097 .unlocked_ioctl = gfs2_ioctl,

+2 -2

fs/hfs/inode.c

reviewed

··· 674 674 675 675 static const struct file_operations hfs_file_operations = { 676 676 .llseek = generic_file_llseek, 677 677 - .read = do_sync_read, 678 678 - .aio_read = generic_file_aio_read, 677 677 + .read = new_sync_read, 678 678 + .read_iter = generic_file_read_iter, 679 679 .write = do_sync_write, 680 680 .aio_write = generic_file_aio_write, 681 681 .mmap = generic_file_mmap,

+2 -2

fs/hfsplus/inode.c

reviewed

··· 341 341 342 342 static const struct file_operations hfsplus_file_operations = { 343 343 .llseek = generic_file_llseek, 344 344 - .read = do_sync_read, 345 345 - .aio_read = generic_file_aio_read, 344 344 + .read = new_sync_read, 345 345 + .read_iter = generic_file_read_iter, 346 346 .write = do_sync_write, 347 347 .aio_write = generic_file_aio_write, 348 348 .mmap = generic_file_mmap,

+2 -2

fs/hostfs/hostfs_kern.c

reviewed

··· 378 378 379 379 static const struct file_operations hostfs_file_fops = { 380 380 .llseek = generic_file_llseek, 381 381 - .read = do_sync_read, 381 381 + .read = new_sync_read, 382 382 .splice_read = generic_file_splice_read, 383 383 - .aio_read = generic_file_aio_read, 383 383 + .read_iter = generic_file_read_iter, 384 384 .aio_write = generic_file_aio_write, 385 385 .write = do_sync_write, 386 386 .mmap = generic_file_mmap,

+2 -2

fs/hpfs/file.c

reviewed

··· 197 197 const struct file_operations hpfs_file_ops = 198 198 { 199 199 .llseek = generic_file_llseek, 200 200 - .read = do_sync_read, 201 201 - .aio_read = generic_file_aio_read, 200 200 + .read = new_sync_read, 201 201 + .read_iter = generic_file_read_iter, 202 202 .write = do_sync_write, 203 203 .aio_write = generic_file_aio_write, 204 204 .mmap = generic_file_mmap,

+2 -2

fs/jffs2/file.c

reviewed

··· 51 51 { 52 52 .llseek = generic_file_llseek, 53 53 .open = generic_file_open, 54 54 - .read = do_sync_read, 55 55 - .aio_read = generic_file_aio_read, 54 54 + .read = new_sync_read, 55 55 + .read_iter = generic_file_read_iter, 56 56 .write = do_sync_write, 57 57 .aio_write = generic_file_aio_write, 58 58 .unlocked_ioctl=jffs2_ioctl,

+2 -2

fs/jfs/file.c

reviewed

··· 152 152 .open = jfs_open, 153 153 .llseek = generic_file_llseek, 154 154 .write = do_sync_write, 155 155 - .read = do_sync_read, 156 156 - .aio_read = generic_file_aio_read, 155 155 + .read = new_sync_read, 156 156 + .read_iter = generic_file_read_iter, 157 157 .aio_write = generic_file_aio_write, 158 158 .mmap = generic_file_mmap, 159 159 .splice_read = generic_file_splice_read,

+2 -2

fs/logfs/file.c

reviewed

··· 264 264 }; 265 265 266 266 const struct file_operations logfs_reg_fops = { 267 267 - .aio_read = generic_file_aio_read, 267 267 + .read_iter = generic_file_read_iter, 268 268 .aio_write = generic_file_aio_write, 269 269 .fsync = logfs_fsync, 270 270 .unlocked_ioctl = logfs_ioctl, 271 271 .llseek = generic_file_llseek, 272 272 .mmap = generic_file_readonly_mmap, 273 273 .open = generic_file_open, 274 274 - .read = do_sync_read, 274 274 + .read = new_sync_read, 275 275 .write = do_sync_write, 276 276 }; 277 277

+2 -2

fs/minix/file.c

reviewed

··· 14 14 */ 15 15 const struct file_operations minix_file_operations = { 16 16 .llseek = generic_file_llseek, 17 17 - .read = do_sync_read, 18 18 - .aio_read = generic_file_aio_read, 17 17 + .read = new_sync_read, 18 18 + .read_iter = generic_file_read_iter, 19 19 .write = do_sync_write, 20 20 .aio_write = generic_file_aio_write, 21 21 .mmap = generic_file_mmap,

+2 -2

fs/nilfs2/file.c

reviewed

··· 152 152 */ 153 153 const struct file_operations nilfs_file_operations = { 154 154 .llseek = generic_file_llseek, 155 155 - .read = do_sync_read, 155 155 + .read = new_sync_read, 156 156 .write = do_sync_write, 157 157 - .aio_read = generic_file_aio_read, 157 157 + .read_iter = generic_file_read_iter, 158 158 .aio_write = generic_file_aio_write, 159 159 .unlocked_ioctl = nilfs_ioctl, 160 160 #ifdef CONFIG_COMPAT

+2 -2

fs/ntfs/file.c

reviewed

··· 2200 2200 2201 2201 const struct file_operations ntfs_file_ops = { 2202 2202 .llseek = generic_file_llseek, /* Seek inside file. */ 2203 2203 - .read = do_sync_read, /* Read from file. */ 2204 2204 - .aio_read = generic_file_aio_read, /* Async read from file. */ 2203 2203 + .read = new_sync_read, /* Read from file. */ 2204 2204 + .read_iter = generic_file_read_iter, /* Async read from file. */ 2205 2205 #ifdef NTFS_RW 2206 2206 .write = do_sync_write, /* Write to file. */ 2207 2207 .aio_write = ntfs_file_aio_write, /* Async write to file. */

+2 -2

fs/omfs/file.c

reviewed

··· 337 337 338 338 const struct file_operations omfs_file_operations = { 339 339 .llseek = generic_file_llseek, 340 340 - .read = do_sync_read, 340 340 + .read = new_sync_read, 341 341 .write = do_sync_write, 342 342 - .aio_read = generic_file_aio_read, 342 342 + .read_iter = generic_file_read_iter, 343 343 .aio_write = generic_file_aio_write, 344 344 .mmap = generic_file_mmap, 345 345 .fsync = generic_file_fsync,

+2 -2

fs/ramfs/file-mmu.c

reviewed

··· 31 31 #include "internal.h" 32 32 33 33 const struct file_operations ramfs_file_operations = { 34 34 - .read = do_sync_read, 35 35 - .aio_read = generic_file_aio_read, 34 34 + .read = new_sync_read, 35 35 + .read_iter = generic_file_read_iter, 36 36 .write = do_sync_write, 37 37 .aio_write = generic_file_aio_write, 38 38 .mmap = generic_file_mmap,

+2 -2

fs/ramfs/file-nommu.c

reviewed

··· 37 37 const struct file_operations ramfs_file_operations = { 38 38 .mmap = ramfs_nommu_mmap, 39 39 .get_unmapped_area = ramfs_nommu_get_unmapped_area, 40 40 - .read = do_sync_read, 41 41 - .aio_read = generic_file_aio_read, 40 40 + .read = new_sync_read, 41 41 + .read_iter = generic_file_read_iter, 42 42 .write = do_sync_write, 43 43 .aio_write = generic_file_aio_write, 44 44 .fsync = noop_fsync,

+2 -2

fs/read_write.c

reviewed

··· 29 29 30 30 const struct file_operations generic_ro_fops = { 31 31 .llseek = generic_file_llseek, 32 32 - .read = do_sync_read, 33 33 - .aio_read = generic_file_aio_read, 32 32 + .read = new_sync_read, 33 33 + .read_iter = generic_file_read_iter, 34 34 .mmap = generic_file_readonly_mmap, 35 35 .splice_read = generic_file_splice_read, 36 36 };

+2 -2

fs/reiserfs/file.c

reviewed

··· 235 235 } 236 236 237 237 const struct file_operations reiserfs_file_operations = { 238 238 - .read = do_sync_read, 238 238 + .read = new_sync_read, 239 239 .write = do_sync_write, 240 240 .unlocked_ioctl = reiserfs_ioctl, 241 241 #ifdef CONFIG_COMPAT ··· 245 245 .open = reiserfs_file_open, 246 246 .release = reiserfs_file_release, 247 247 .fsync = reiserfs_sync_file, 248 248 - .aio_read = generic_file_aio_read, 248 248 + .read_iter = generic_file_read_iter, 249 249 .aio_write = generic_file_aio_write, 250 250 .splice_read = generic_file_splice_read, 251 251 .splice_write = generic_file_splice_write,

+2 -2

fs/romfs/mmap-nommu.c

reviewed

··· 72 72 73 73 const struct file_operations romfs_ro_fops = { 74 74 .llseek = generic_file_llseek, 75 75 - .read = do_sync_read, 76 76 - .aio_read = generic_file_aio_read, 75 75 + .read = new_sync_read, 76 76 + .read_iter = generic_file_read_iter, 77 77 .splice_read = generic_file_splice_read, 78 78 .mmap = romfs_mmap, 79 79 .get_unmapped_area = romfs_get_unmapped_area,

+2 -2

fs/sysv/file.c

reviewed

··· 21 21 */ 22 22 const struct file_operations sysv_file_operations = { 23 23 .llseek = generic_file_llseek, 24 24 - .read = do_sync_read, 25 25 - .aio_read = generic_file_aio_read, 24 24 + .read = new_sync_read, 25 25 + .read_iter = generic_file_read_iter, 26 26 .write = do_sync_write, 27 27 .aio_write = generic_file_aio_write, 28 28 .mmap = generic_file_mmap,

+2 -2

fs/ubifs/file.c

reviewed

··· 1582 1582 1583 1583 const struct file_operations ubifs_file_operations = { 1584 1584 .llseek = generic_file_llseek, 1585 1585 - .read = do_sync_read, 1585 1585 + .read = new_sync_read, 1586 1586 .write = do_sync_write, 1587 1587 - .aio_read = generic_file_aio_read, 1587 1587 + .read_iter = generic_file_read_iter, 1588 1588 .aio_write = ubifs_aio_write, 1589 1589 .mmap = ubifs_file_mmap, 1590 1590 .fsync = ubifs_fsync,

+2 -2

fs/udf/file.c

reviewed

··· 252 252 } 253 253 254 254 const struct file_operations udf_file_operations = { 255 255 - .read = do_sync_read, 256 256 - .aio_read = generic_file_aio_read, 255 255 + .read = new_sync_read, 256 256 + .read_iter = generic_file_read_iter, 257 257 .unlocked_ioctl = udf_ioctl, 258 258 .open = generic_file_open, 259 259 .mmap = generic_file_mmap,

+2 -2

fs/ufs/file.c

reviewed

··· 35 35 36 36 const struct file_operations ufs_file_operations = { 37 37 .llseek = generic_file_llseek, 38 38 - .read = do_sync_read, 39 39 - .aio_read = generic_file_aio_read, 38 38 + .read = new_sync_read, 39 39 + .read_iter = generic_file_read_iter, 40 40 .write = do_sync_write, 41 41 .aio_write = generic_file_aio_write, 42 42 .mmap = generic_file_mmap,