diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-30 22:37:34 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-09 11:41:14 -0400 |
commit | c51da20c48b76ef1114d14b6b6ff190e11afab0e (patch) | |
tree | 621f945c5d2a1279c7cbf8e5dcc21f00cfc9a12d | |
parent | 060ff688cadac398a17f09bd87b16fd0bf943899 (diff) |
more trivial ->iterate_shared conversions
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/bfs/dir.c | 2 | ||||
-rw-r--r-- | fs/cramfs/inode.c | 2 | ||||
-rw-r--r-- | fs/efs/dir.c | 3 | ||||
-rw-r--r-- | fs/exofs/dir.c | 2 | ||||
-rw-r--r-- | fs/freevxfs/vxfs_lookup.c | 2 | ||||
-rw-r--r-- | fs/jffs2/dir.c | 2 | ||||
-rw-r--r-- | fs/libfs.c | 2 | ||||
-rw-r--r-- | fs/logfs/dir.c | 2 | ||||
-rw-r--r-- | fs/nilfs2/dir.c | 2 | ||||
-rw-r--r-- | fs/omfs/dir.c | 2 | ||||
-rw-r--r-- | fs/openpromfs/inode.c | 2 | ||||
-rw-r--r-- | fs/qnx4/dir.c | 2 | ||||
-rw-r--r-- | fs/qnx6/dir.c | 2 | ||||
-rw-r--r-- | fs/reiserfs/dir.c | 2 | ||||
-rw-r--r-- | fs/ubifs/dir.c | 2 | ||||
-rw-r--r-- | fs/udf/dir.c | 2 |
16 files changed, 16 insertions, 17 deletions
diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c index 3ec6113146c0..34a5bc2f1290 100644 --- a/fs/bfs/dir.c +++ b/fs/bfs/dir.c | |||
@@ -70,7 +70,7 @@ static int bfs_readdir(struct file *f, struct dir_context *ctx) | |||
70 | 70 | ||
71 | const struct file_operations bfs_dir_operations = { | 71 | const struct file_operations bfs_dir_operations = { |
72 | .read = generic_read_dir, | 72 | .read = generic_read_dir, |
73 | .iterate = bfs_readdir, | 73 | .iterate_shared = bfs_readdir, |
74 | .fsync = generic_file_fsync, | 74 | .fsync = generic_file_fsync, |
75 | .llseek = generic_file_llseek, | 75 | .llseek = generic_file_llseek, |
76 | }; | 76 | }; |
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index 3a32ddf98095..7919967488cb 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c | |||
@@ -561,7 +561,7 @@ static const struct address_space_operations cramfs_aops = { | |||
561 | static const struct file_operations cramfs_directory_operations = { | 561 | static const struct file_operations cramfs_directory_operations = { |
562 | .llseek = generic_file_llseek, | 562 | .llseek = generic_file_llseek, |
563 | .read = generic_read_dir, | 563 | .read = generic_read_dir, |
564 | .iterate = cramfs_readdir, | 564 | .iterate_shared = cramfs_readdir, |
565 | }; | 565 | }; |
566 | 566 | ||
567 | static const struct inode_operations cramfs_dir_inode_operations = { | 567 | static const struct inode_operations cramfs_dir_inode_operations = { |
diff --git a/fs/efs/dir.c b/fs/efs/dir.c index ce63b24f7c3e..a7be96e5f1cb 100644 --- a/fs/efs/dir.c +++ b/fs/efs/dir.c | |||
@@ -12,7 +12,7 @@ static int efs_readdir(struct file *, struct dir_context *); | |||
12 | const struct file_operations efs_dir_operations = { | 12 | const struct file_operations efs_dir_operations = { |
13 | .llseek = generic_file_llseek, | 13 | .llseek = generic_file_llseek, |
14 | .read = generic_read_dir, | 14 | .read = generic_read_dir, |
15 | .iterate = efs_readdir, | 15 | .iterate_shared = efs_readdir, |
16 | }; | 16 | }; |
17 | 17 | ||
18 | const struct inode_operations efs_dir_inode_operations = { | 18 | const struct inode_operations efs_dir_inode_operations = { |
@@ -100,4 +100,3 @@ static int efs_readdir(struct file *file, struct dir_context *ctx) | |||
100 | ctx->pos = (block << EFS_DIRBSIZE_BITS) | slot; | 100 | ctx->pos = (block << EFS_DIRBSIZE_BITS) | slot; |
101 | return 0; | 101 | return 0; |
102 | } | 102 | } |
103 | |||
diff --git a/fs/exofs/dir.c b/fs/exofs/dir.c index a7661aaead9a..f69a1b5826a5 100644 --- a/fs/exofs/dir.c +++ b/fs/exofs/dir.c | |||
@@ -657,5 +657,5 @@ not_empty: | |||
657 | const struct file_operations exofs_dir_operations = { | 657 | const struct file_operations exofs_dir_operations = { |
658 | .llseek = generic_file_llseek, | 658 | .llseek = generic_file_llseek, |
659 | .read = generic_read_dir, | 659 | .read = generic_read_dir, |
660 | .iterate = exofs_readdir, | 660 | .iterate_shared = exofs_readdir, |
661 | }; | 661 | }; |
diff --git a/fs/freevxfs/vxfs_lookup.c b/fs/freevxfs/vxfs_lookup.c index a49e0cfbb686..6d576b97f2c8 100644 --- a/fs/freevxfs/vxfs_lookup.c +++ b/fs/freevxfs/vxfs_lookup.c | |||
@@ -58,7 +58,7 @@ const struct inode_operations vxfs_dir_inode_ops = { | |||
58 | const struct file_operations vxfs_dir_operations = { | 58 | const struct file_operations vxfs_dir_operations = { |
59 | .llseek = generic_file_llseek, | 59 | .llseek = generic_file_llseek, |
60 | .read = generic_read_dir, | 60 | .read = generic_read_dir, |
61 | .iterate = vxfs_readdir, | 61 | .iterate_shared = vxfs_readdir, |
62 | }; | 62 | }; |
63 | 63 | ||
64 | static inline u_long | 64 | static inline u_long |
diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c index 7a9579e03dbb..84c4bf3631a2 100644 --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c | |||
@@ -40,7 +40,7 @@ static int jffs2_rename (struct inode *, struct dentry *, | |||
40 | const struct file_operations jffs2_dir_operations = | 40 | const struct file_operations jffs2_dir_operations = |
41 | { | 41 | { |
42 | .read = generic_read_dir, | 42 | .read = generic_read_dir, |
43 | .iterate = jffs2_readdir, | 43 | .iterate_shared=jffs2_readdir, |
44 | .unlocked_ioctl=jffs2_ioctl, | 44 | .unlocked_ioctl=jffs2_ioctl, |
45 | .fsync = jffs2_fsync, | 45 | .fsync = jffs2_fsync, |
46 | .llseek = generic_file_llseek, | 46 | .llseek = generic_file_llseek, |
diff --git a/fs/libfs.c b/fs/libfs.c index dd8a074482ac..8765ff1adc07 100644 --- a/fs/libfs.c +++ b/fs/libfs.c | |||
@@ -1166,7 +1166,7 @@ static int empty_dir_readdir(struct file *file, struct dir_context *ctx) | |||
1166 | static const struct file_operations empty_dir_operations = { | 1166 | static const struct file_operations empty_dir_operations = { |
1167 | .llseek = empty_dir_llseek, | 1167 | .llseek = empty_dir_llseek, |
1168 | .read = generic_read_dir, | 1168 | .read = generic_read_dir, |
1169 | .iterate = empty_dir_readdir, | 1169 | .iterate_shared = empty_dir_readdir, |
1170 | .fsync = noop_fsync, | 1170 | .fsync = noop_fsync, |
1171 | }; | 1171 | }; |
1172 | 1172 | ||
diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c index ddbed2be5366..c65decae7921 100644 --- a/fs/logfs/dir.c +++ b/fs/logfs/dir.c | |||
@@ -791,7 +791,7 @@ const struct inode_operations logfs_dir_iops = { | |||
791 | const struct file_operations logfs_dir_fops = { | 791 | const struct file_operations logfs_dir_fops = { |
792 | .fsync = logfs_fsync, | 792 | .fsync = logfs_fsync, |
793 | .unlocked_ioctl = logfs_ioctl, | 793 | .unlocked_ioctl = logfs_ioctl, |
794 | .iterate = logfs_readdir, | 794 | .iterate_shared = logfs_readdir, |
795 | .read = generic_read_dir, | 795 | .read = generic_read_dir, |
796 | .llseek = default_llseek, | 796 | .llseek = default_llseek, |
797 | }; | 797 | }; |
diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index 2eaed9254eb2..6723d45a631a 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c | |||
@@ -661,7 +661,7 @@ not_empty: | |||
661 | const struct file_operations nilfs_dir_operations = { | 661 | const struct file_operations nilfs_dir_operations = { |
662 | .llseek = generic_file_llseek, | 662 | .llseek = generic_file_llseek, |
663 | .read = generic_read_dir, | 663 | .read = generic_read_dir, |
664 | .iterate = nilfs_readdir, | 664 | .iterate_shared = nilfs_readdir, |
665 | .unlocked_ioctl = nilfs_ioctl, | 665 | .unlocked_ioctl = nilfs_ioctl, |
666 | #ifdef CONFIG_COMPAT | 666 | #ifdef CONFIG_COMPAT |
667 | .compat_ioctl = nilfs_compat_ioctl, | 667 | .compat_ioctl = nilfs_compat_ioctl, |
diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c index f833bf8d5792..c8cbf3b60645 100644 --- a/fs/omfs/dir.c +++ b/fs/omfs/dir.c | |||
@@ -452,6 +452,6 @@ const struct inode_operations omfs_dir_inops = { | |||
452 | 452 | ||
453 | const struct file_operations omfs_dir_operations = { | 453 | const struct file_operations omfs_dir_operations = { |
454 | .read = generic_read_dir, | 454 | .read = generic_read_dir, |
455 | .iterate = omfs_readdir, | 455 | .iterate_shared = omfs_readdir, |
456 | .llseek = generic_file_llseek, | 456 | .llseek = generic_file_llseek, |
457 | }; | 457 | }; |
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c index b61b883c8ff8..c7a86993d97e 100644 --- a/fs/openpromfs/inode.c +++ b/fs/openpromfs/inode.c | |||
@@ -166,7 +166,7 @@ static int openpromfs_readdir(struct file *, struct dir_context *); | |||
166 | 166 | ||
167 | static const struct file_operations openprom_operations = { | 167 | static const struct file_operations openprom_operations = { |
168 | .read = generic_read_dir, | 168 | .read = generic_read_dir, |
169 | .iterate = openpromfs_readdir, | 169 | .iterate_shared = openpromfs_readdir, |
170 | .llseek = generic_file_llseek, | 170 | .llseek = generic_file_llseek, |
171 | }; | 171 | }; |
172 | 172 | ||
diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c index b218f965817b..781056a0480f 100644 --- a/fs/qnx4/dir.c +++ b/fs/qnx4/dir.c | |||
@@ -71,7 +71,7 @@ const struct file_operations qnx4_dir_operations = | |||
71 | { | 71 | { |
72 | .llseek = generic_file_llseek, | 72 | .llseek = generic_file_llseek, |
73 | .read = generic_read_dir, | 73 | .read = generic_read_dir, |
74 | .iterate = qnx4_readdir, | 74 | .iterate_shared = qnx4_readdir, |
75 | .fsync = generic_file_fsync, | 75 | .fsync = generic_file_fsync, |
76 | }; | 76 | }; |
77 | 77 | ||
diff --git a/fs/qnx6/dir.c b/fs/qnx6/dir.c index 144ceda4948e..27637e0bdc9f 100644 --- a/fs/qnx6/dir.c +++ b/fs/qnx6/dir.c | |||
@@ -272,7 +272,7 @@ found: | |||
272 | const struct file_operations qnx6_dir_operations = { | 272 | const struct file_operations qnx6_dir_operations = { |
273 | .llseek = generic_file_llseek, | 273 | .llseek = generic_file_llseek, |
274 | .read = generic_read_dir, | 274 | .read = generic_read_dir, |
275 | .iterate = qnx6_readdir, | 275 | .iterate_shared = qnx6_readdir, |
276 | .fsync = generic_file_fsync, | 276 | .fsync = generic_file_fsync, |
277 | }; | 277 | }; |
278 | 278 | ||
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c index 3abd4004184b..45aa05e2232f 100644 --- a/fs/reiserfs/dir.c +++ b/fs/reiserfs/dir.c | |||
@@ -20,7 +20,7 @@ static int reiserfs_dir_fsync(struct file *filp, loff_t start, loff_t end, | |||
20 | const struct file_operations reiserfs_dir_operations = { | 20 | const struct file_operations reiserfs_dir_operations = { |
21 | .llseek = generic_file_llseek, | 21 | .llseek = generic_file_llseek, |
22 | .read = generic_read_dir, | 22 | .read = generic_read_dir, |
23 | .iterate = reiserfs_readdir, | 23 | .iterate_shared = reiserfs_readdir, |
24 | .fsync = reiserfs_dir_fsync, | 24 | .fsync = reiserfs_dir_fsync, |
25 | .unlocked_ioctl = reiserfs_ioctl, | 25 | .unlocked_ioctl = reiserfs_ioctl, |
26 | #ifdef CONFIG_COMPAT | 26 | #ifdef CONFIG_COMPAT |
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 795992a8321e..34a5356d0ce7 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c | |||
@@ -1195,7 +1195,7 @@ const struct file_operations ubifs_dir_operations = { | |||
1195 | .llseek = generic_file_llseek, | 1195 | .llseek = generic_file_llseek, |
1196 | .release = ubifs_dir_release, | 1196 | .release = ubifs_dir_release, |
1197 | .read = generic_read_dir, | 1197 | .read = generic_read_dir, |
1198 | .iterate = ubifs_readdir, | 1198 | .iterate_shared = ubifs_readdir, |
1199 | .fsync = ubifs_fsync, | 1199 | .fsync = ubifs_fsync, |
1200 | .unlocked_ioctl = ubifs_ioctl, | 1200 | .unlocked_ioctl = ubifs_ioctl, |
1201 | #ifdef CONFIG_COMPAT | 1201 | #ifdef CONFIG_COMPAT |
diff --git a/fs/udf/dir.c b/fs/udf/dir.c index b51b371b874a..4c5593abc553 100644 --- a/fs/udf/dir.c +++ b/fs/udf/dir.c | |||
@@ -202,7 +202,7 @@ out: | |||
202 | const struct file_operations udf_dir_operations = { | 202 | const struct file_operations udf_dir_operations = { |
203 | .llseek = generic_file_llseek, | 203 | .llseek = generic_file_llseek, |
204 | .read = generic_read_dir, | 204 | .read = generic_read_dir, |
205 | .iterate = udf_readdir, | 205 | .iterate_shared = udf_readdir, |
206 | .unlocked_ioctl = udf_ioctl, | 206 | .unlocked_ioctl = udf_ioctl, |
207 | .fsync = generic_file_fsync, | 207 | .fsync = generic_file_fsync, |
208 | }; | 208 | }; |