diff options
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/inode.c | 2 | ||||
-rw-r--r-- | fs/btrfs/inode.c | 20 | ||||
-rw-r--r-- | fs/cifs/cifs_dfs_ref.c | 2 | ||||
-rw-r--r-- | fs/cifs/cifsfs.h | 2 | ||||
-rw-r--r-- | fs/inode.c | 2 | ||||
-rw-r--r-- | fs/nilfs2/file.c | 2 | ||||
-rw-r--r-- | fs/nilfs2/mdt.c | 2 | ||||
-rw-r--r-- | fs/nilfs2/namei.c | 6 | ||||
-rw-r--r-- | fs/nilfs2/nilfs.h | 8 | ||||
-rw-r--r-- | fs/omfs/dir.c | 2 | ||||
-rw-r--r-- | fs/omfs/file.c | 2 | ||||
-rw-r--r-- | fs/omfs/omfs.h | 4 | ||||
-rw-r--r-- | fs/romfs/super.c | 2 | ||||
-rw-r--r-- | kernel/cgroup.c | 4 |
14 files changed, 30 insertions, 30 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index 78f2a52f7288..fc1b1c42b1dc 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c | |||
@@ -119,7 +119,7 @@ spufs_new_file(struct super_block *sb, struct dentry *dentry, | |||
119 | const struct file_operations *fops, int mode, | 119 | const struct file_operations *fops, int mode, |
120 | size_t size, struct spu_context *ctx) | 120 | size_t size, struct spu_context *ctx) |
121 | { | 121 | { |
122 | static struct inode_operations spufs_file_iops = { | 122 | static const struct inode_operations spufs_file_iops = { |
123 | .setattr = spufs_setattr, | 123 | .setattr = spufs_setattr, |
124 | }; | 124 | }; |
125 | struct inode *inode; | 125 | struct inode *inode; |
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 3e4d67957886..9096fd0ca3ca 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -55,11 +55,11 @@ struct btrfs_iget_args { | |||
55 | struct btrfs_root *root; | 55 | struct btrfs_root *root; |
56 | }; | 56 | }; |
57 | 57 | ||
58 | static struct inode_operations btrfs_dir_inode_operations; | 58 | static const struct inode_operations btrfs_dir_inode_operations; |
59 | static struct inode_operations btrfs_symlink_inode_operations; | 59 | static const struct inode_operations btrfs_symlink_inode_operations; |
60 | static struct inode_operations btrfs_dir_ro_inode_operations; | 60 | static const struct inode_operations btrfs_dir_ro_inode_operations; |
61 | static struct inode_operations btrfs_special_inode_operations; | 61 | static const struct inode_operations btrfs_special_inode_operations; |
62 | static struct inode_operations btrfs_file_inode_operations; | 62 | static const struct inode_operations btrfs_file_inode_operations; |
63 | static const struct address_space_operations btrfs_aops; | 63 | static const struct address_space_operations btrfs_aops; |
64 | static const struct address_space_operations btrfs_symlink_aops; | 64 | static const struct address_space_operations btrfs_symlink_aops; |
65 | static struct file_operations btrfs_dir_file_operations; | 65 | static struct file_operations btrfs_dir_file_operations; |
@@ -5201,7 +5201,7 @@ static int btrfs_permission(struct inode *inode, int mask) | |||
5201 | return generic_permission(inode, mask, btrfs_check_acl); | 5201 | return generic_permission(inode, mask, btrfs_check_acl); |
5202 | } | 5202 | } |
5203 | 5203 | ||
5204 | static struct inode_operations btrfs_dir_inode_operations = { | 5204 | static const struct inode_operations btrfs_dir_inode_operations = { |
5205 | .getattr = btrfs_getattr, | 5205 | .getattr = btrfs_getattr, |
5206 | .lookup = btrfs_lookup, | 5206 | .lookup = btrfs_lookup, |
5207 | .create = btrfs_create, | 5207 | .create = btrfs_create, |
@@ -5219,7 +5219,7 @@ static struct inode_operations btrfs_dir_inode_operations = { | |||
5219 | .removexattr = btrfs_removexattr, | 5219 | .removexattr = btrfs_removexattr, |
5220 | .permission = btrfs_permission, | 5220 | .permission = btrfs_permission, |
5221 | }; | 5221 | }; |
5222 | static struct inode_operations btrfs_dir_ro_inode_operations = { | 5222 | static const struct inode_operations btrfs_dir_ro_inode_operations = { |
5223 | .lookup = btrfs_lookup, | 5223 | .lookup = btrfs_lookup, |
5224 | .permission = btrfs_permission, | 5224 | .permission = btrfs_permission, |
5225 | }; | 5225 | }; |
@@ -5278,7 +5278,7 @@ static const struct address_space_operations btrfs_symlink_aops = { | |||
5278 | .releasepage = btrfs_releasepage, | 5278 | .releasepage = btrfs_releasepage, |
5279 | }; | 5279 | }; |
5280 | 5280 | ||
5281 | static struct inode_operations btrfs_file_inode_operations = { | 5281 | static const struct inode_operations btrfs_file_inode_operations = { |
5282 | .truncate = btrfs_truncate, | 5282 | .truncate = btrfs_truncate, |
5283 | .getattr = btrfs_getattr, | 5283 | .getattr = btrfs_getattr, |
5284 | .setattr = btrfs_setattr, | 5284 | .setattr = btrfs_setattr, |
@@ -5290,7 +5290,7 @@ static struct inode_operations btrfs_file_inode_operations = { | |||
5290 | .fallocate = btrfs_fallocate, | 5290 | .fallocate = btrfs_fallocate, |
5291 | .fiemap = btrfs_fiemap, | 5291 | .fiemap = btrfs_fiemap, |
5292 | }; | 5292 | }; |
5293 | static struct inode_operations btrfs_special_inode_operations = { | 5293 | static const struct inode_operations btrfs_special_inode_operations = { |
5294 | .getattr = btrfs_getattr, | 5294 | .getattr = btrfs_getattr, |
5295 | .setattr = btrfs_setattr, | 5295 | .setattr = btrfs_setattr, |
5296 | .permission = btrfs_permission, | 5296 | .permission = btrfs_permission, |
@@ -5299,7 +5299,7 @@ static struct inode_operations btrfs_special_inode_operations = { | |||
5299 | .listxattr = btrfs_listxattr, | 5299 | .listxattr = btrfs_listxattr, |
5300 | .removexattr = btrfs_removexattr, | 5300 | .removexattr = btrfs_removexattr, |
5301 | }; | 5301 | }; |
5302 | static struct inode_operations btrfs_symlink_inode_operations = { | 5302 | static const struct inode_operations btrfs_symlink_inode_operations = { |
5303 | .readlink = generic_readlink, | 5303 | .readlink = generic_readlink, |
5304 | .follow_link = page_follow_link_light, | 5304 | .follow_link = page_follow_link_light, |
5305 | .put_link = page_put_link, | 5305 | .put_link = page_put_link, |
diff --git a/fs/cifs/cifs_dfs_ref.c b/fs/cifs/cifs_dfs_ref.c index 606912d8f2a8..6889c0d07b82 100644 --- a/fs/cifs/cifs_dfs_ref.c +++ b/fs/cifs/cifs_dfs_ref.c | |||
@@ -385,7 +385,7 @@ out_err: | |||
385 | goto out; | 385 | goto out; |
386 | } | 386 | } |
387 | 387 | ||
388 | struct inode_operations cifs_dfs_referral_inode_operations = { | 388 | const struct inode_operations cifs_dfs_referral_inode_operations = { |
389 | .follow_link = cifs_dfs_follow_mountpoint, | 389 | .follow_link = cifs_dfs_follow_mountpoint, |
390 | }; | 390 | }; |
391 | 391 | ||
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index 094325e3f714..ac2b24c192f8 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h | |||
@@ -67,7 +67,7 @@ extern int cifs_setattr(struct dentry *, struct iattr *); | |||
67 | 67 | ||
68 | extern const struct inode_operations cifs_file_inode_ops; | 68 | extern const struct inode_operations cifs_file_inode_ops; |
69 | extern const struct inode_operations cifs_symlink_inode_ops; | 69 | extern const struct inode_operations cifs_symlink_inode_ops; |
70 | extern struct inode_operations cifs_dfs_referral_inode_operations; | 70 | extern const struct inode_operations cifs_dfs_referral_inode_operations; |
71 | 71 | ||
72 | 72 | ||
73 | /* Functions related to files and directories */ | 73 | /* Functions related to files and directories */ |
diff --git a/fs/inode.c b/fs/inode.c index 798052f87035..f5ff71cb3e2b 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
@@ -123,7 +123,7 @@ static void wake_up_inode(struct inode *inode) | |||
123 | int inode_init_always(struct super_block *sb, struct inode *inode) | 123 | int inode_init_always(struct super_block *sb, struct inode *inode) |
124 | { | 124 | { |
125 | static const struct address_space_operations empty_aops; | 125 | static const struct address_space_operations empty_aops; |
126 | static struct inode_operations empty_iops; | 126 | static const struct inode_operations empty_iops; |
127 | static const struct file_operations empty_fops; | 127 | static const struct file_operations empty_fops; |
128 | struct address_space *const mapping = &inode->i_data; | 128 | struct address_space *const mapping = &inode->i_data; |
129 | 129 | ||
diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c index 6bd84a0d8238..fc8278c77cdd 100644 --- a/fs/nilfs2/file.c +++ b/fs/nilfs2/file.c | |||
@@ -151,7 +151,7 @@ struct file_operations nilfs_file_operations = { | |||
151 | .splice_read = generic_file_splice_read, | 151 | .splice_read = generic_file_splice_read, |
152 | }; | 152 | }; |
153 | 153 | ||
154 | struct inode_operations nilfs_file_inode_operations = { | 154 | const struct inode_operations nilfs_file_inode_operations = { |
155 | .truncate = nilfs_truncate, | 155 | .truncate = nilfs_truncate, |
156 | .setattr = nilfs_setattr, | 156 | .setattr = nilfs_setattr, |
157 | .permission = nilfs_permission, | 157 | .permission = nilfs_permission, |
diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c index 680e86c8d435..b18c4998f8d0 100644 --- a/fs/nilfs2/mdt.c +++ b/fs/nilfs2/mdt.c | |||
@@ -432,7 +432,7 @@ static const struct address_space_operations def_mdt_aops = { | |||
432 | .sync_page = block_sync_page, | 432 | .sync_page = block_sync_page, |
433 | }; | 433 | }; |
434 | 434 | ||
435 | static struct inode_operations def_mdt_iops; | 435 | static const struct inode_operations def_mdt_iops; |
436 | static struct file_operations def_mdt_fops; | 436 | static struct file_operations def_mdt_fops; |
437 | 437 | ||
438 | /* | 438 | /* |
diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c index df70dadb336f..ed02e886fa79 100644 --- a/fs/nilfs2/namei.c +++ b/fs/nilfs2/namei.c | |||
@@ -448,7 +448,7 @@ out: | |||
448 | return err; | 448 | return err; |
449 | } | 449 | } |
450 | 450 | ||
451 | struct inode_operations nilfs_dir_inode_operations = { | 451 | const struct inode_operations nilfs_dir_inode_operations = { |
452 | .create = nilfs_create, | 452 | .create = nilfs_create, |
453 | .lookup = nilfs_lookup, | 453 | .lookup = nilfs_lookup, |
454 | .link = nilfs_link, | 454 | .link = nilfs_link, |
@@ -462,12 +462,12 @@ struct inode_operations nilfs_dir_inode_operations = { | |||
462 | .permission = nilfs_permission, | 462 | .permission = nilfs_permission, |
463 | }; | 463 | }; |
464 | 464 | ||
465 | struct inode_operations nilfs_special_inode_operations = { | 465 | const struct inode_operations nilfs_special_inode_operations = { |
466 | .setattr = nilfs_setattr, | 466 | .setattr = nilfs_setattr, |
467 | .permission = nilfs_permission, | 467 | .permission = nilfs_permission, |
468 | }; | 468 | }; |
469 | 469 | ||
470 | struct inode_operations nilfs_symlink_inode_operations = { | 470 | const struct inode_operations nilfs_symlink_inode_operations = { |
471 | .readlink = generic_readlink, | 471 | .readlink = generic_readlink, |
472 | .follow_link = page_follow_link_light, | 472 | .follow_link = page_follow_link_light, |
473 | .put_link = page_put_link, | 473 | .put_link = page_put_link, |
diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h index c0cf52a86562..bad7368782d0 100644 --- a/fs/nilfs2/nilfs.h +++ b/fs/nilfs2/nilfs.h | |||
@@ -295,12 +295,12 @@ void nilfs_clear_gcdat_inode(struct the_nilfs *); | |||
295 | * Inodes and files operations | 295 | * Inodes and files operations |
296 | */ | 296 | */ |
297 | extern struct file_operations nilfs_dir_operations; | 297 | extern struct file_operations nilfs_dir_operations; |
298 | extern struct inode_operations nilfs_file_inode_operations; | 298 | extern const struct inode_operations nilfs_file_inode_operations; |
299 | extern struct file_operations nilfs_file_operations; | 299 | extern struct file_operations nilfs_file_operations; |
300 | extern const struct address_space_operations nilfs_aops; | 300 | extern const struct address_space_operations nilfs_aops; |
301 | extern struct inode_operations nilfs_dir_inode_operations; | 301 | extern const struct inode_operations nilfs_dir_inode_operations; |
302 | extern struct inode_operations nilfs_special_inode_operations; | 302 | extern const struct inode_operations nilfs_special_inode_operations; |
303 | extern struct inode_operations nilfs_symlink_inode_operations; | 303 | extern const struct inode_operations nilfs_symlink_inode_operations; |
304 | 304 | ||
305 | /* | 305 | /* |
306 | * filesystem type | 306 | * filesystem type |
diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c index c7275cfbdcfb..3680bae335b5 100644 --- a/fs/omfs/dir.c +++ b/fs/omfs/dir.c | |||
@@ -489,7 +489,7 @@ out: | |||
489 | return ret; | 489 | return ret; |
490 | } | 490 | } |
491 | 491 | ||
492 | struct inode_operations omfs_dir_inops = { | 492 | const struct inode_operations omfs_dir_inops = { |
493 | .lookup = omfs_lookup, | 493 | .lookup = omfs_lookup, |
494 | .mkdir = omfs_mkdir, | 494 | .mkdir = omfs_mkdir, |
495 | .rename = omfs_rename, | 495 | .rename = omfs_rename, |
diff --git a/fs/omfs/file.c b/fs/omfs/file.c index b707fa5396b7..4845fbb18e6e 100644 --- a/fs/omfs/file.c +++ b/fs/omfs/file.c | |||
@@ -333,7 +333,7 @@ struct file_operations omfs_file_operations = { | |||
333 | .splice_read = generic_file_splice_read, | 333 | .splice_read = generic_file_splice_read, |
334 | }; | 334 | }; |
335 | 335 | ||
336 | struct inode_operations omfs_file_inops = { | 336 | const struct inode_operations omfs_file_inops = { |
337 | .truncate = omfs_truncate | 337 | .truncate = omfs_truncate |
338 | }; | 338 | }; |
339 | 339 | ||
diff --git a/fs/omfs/omfs.h b/fs/omfs/omfs.h index 16d72ab13d3e..df71039945ac 100644 --- a/fs/omfs/omfs.h +++ b/fs/omfs/omfs.h | |||
@@ -45,14 +45,14 @@ extern int omfs_clear_range(struct super_block *sb, u64 block, int count); | |||
45 | 45 | ||
46 | /* dir.c */ | 46 | /* dir.c */ |
47 | extern struct file_operations omfs_dir_operations; | 47 | extern struct file_operations omfs_dir_operations; |
48 | extern struct inode_operations omfs_dir_inops; | 48 | extern const struct inode_operations omfs_dir_inops; |
49 | extern int omfs_make_empty(struct inode *inode, struct super_block *sb); | 49 | extern int omfs_make_empty(struct inode *inode, struct super_block *sb); |
50 | extern int omfs_is_bad(struct omfs_sb_info *sbi, struct omfs_header *header, | 50 | extern int omfs_is_bad(struct omfs_sb_info *sbi, struct omfs_header *header, |
51 | u64 fsblock); | 51 | u64 fsblock); |
52 | 52 | ||
53 | /* file.c */ | 53 | /* file.c */ |
54 | extern struct file_operations omfs_file_operations; | 54 | extern struct file_operations omfs_file_operations; |
55 | extern struct inode_operations omfs_file_inops; | 55 | extern const struct inode_operations omfs_file_inops; |
56 | extern const struct address_space_operations omfs_aops; | 56 | extern const struct address_space_operations omfs_aops; |
57 | extern void omfs_make_empty_table(struct buffer_head *bh, int offset); | 57 | extern void omfs_make_empty_table(struct buffer_head *bh, int offset); |
58 | extern int omfs_shrink_inode(struct inode *inode); | 58 | extern int omfs_shrink_inode(struct inode *inode); |
diff --git a/fs/romfs/super.c b/fs/romfs/super.c index 4ab3c03d8f95..47f132df0c3f 100644 --- a/fs/romfs/super.c +++ b/fs/romfs/super.c | |||
@@ -284,7 +284,7 @@ static const struct file_operations romfs_dir_operations = { | |||
284 | .readdir = romfs_readdir, | 284 | .readdir = romfs_readdir, |
285 | }; | 285 | }; |
286 | 286 | ||
287 | static struct inode_operations romfs_dir_inode_operations = { | 287 | static const struct inode_operations romfs_dir_inode_operations = { |
288 | .lookup = romfs_lookup, | 288 | .lookup = romfs_lookup, |
289 | }; | 289 | }; |
290 | 290 | ||
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 39dde299a920..213b7f92fcdd 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -596,7 +596,7 @@ void cgroup_unlock(void) | |||
596 | static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, int mode); | 596 | static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, int mode); |
597 | static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry); | 597 | static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry); |
598 | static int cgroup_populate_dir(struct cgroup *cgrp); | 598 | static int cgroup_populate_dir(struct cgroup *cgrp); |
599 | static struct inode_operations cgroup_dir_inode_operations; | 599 | static const struct inode_operations cgroup_dir_inode_operations; |
600 | static struct file_operations proc_cgroupstats_operations; | 600 | static struct file_operations proc_cgroupstats_operations; |
601 | 601 | ||
602 | static struct backing_dev_info cgroup_backing_dev_info = { | 602 | static struct backing_dev_info cgroup_backing_dev_info = { |
@@ -1711,7 +1711,7 @@ static struct file_operations cgroup_file_operations = { | |||
1711 | .release = cgroup_file_release, | 1711 | .release = cgroup_file_release, |
1712 | }; | 1712 | }; |
1713 | 1713 | ||
1714 | static struct inode_operations cgroup_dir_inode_operations = { | 1714 | static const struct inode_operations cgroup_dir_inode_operations = { |
1715 | .lookup = simple_lookup, | 1715 | .lookup = simple_lookup, |
1716 | .mkdir = cgroup_mkdir, | 1716 | .mkdir = cgroup_mkdir, |
1717 | .rmdir = cgroup_rmdir, | 1717 | .rmdir = cgroup_rmdir, |