diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2007-02-12 03:55:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:46 -0500 |
commit | 92e1d5be91a0e3ffa5c4697eeb09b2aa22792122 (patch) | |
tree | 4eb22a9f6c38e9f4cc2a5100cd6659b0af08b7ae /fs/ocfs2 | |
parent | 754661f143e70d66eae6c48532ca245aa05dec0e (diff) |
[PATCH] mark struct inode_operations const 2
Many struct inode_operations in the kernel can be "const". Marking them const
moves these to the .rodata section, which avoids false sharing with potential
dirty data. In addition it'll catch accidental writes at compile time to
these shared resources.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/dlm/dlmfs.c | 12 | ||||
-rw-r--r-- | fs/ocfs2/file.c | 4 | ||||
-rw-r--r-- | fs/ocfs2/file.h | 4 | ||||
-rw-r--r-- | fs/ocfs2/namei.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/namei.h | 2 | ||||
-rw-r--r-- | fs/ocfs2/symlink.c | 4 | ||||
-rw-r--r-- | fs/ocfs2/symlink.h | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c index 30826242bf51..84b33ffb42f1 100644 --- a/fs/ocfs2/dlm/dlmfs.c +++ b/fs/ocfs2/dlm/dlmfs.c | |||
@@ -63,9 +63,9 @@ | |||
63 | 63 | ||
64 | static struct super_operations dlmfs_ops; | 64 | static struct super_operations dlmfs_ops; |
65 | static const struct file_operations dlmfs_file_operations; | 65 | static const struct file_operations dlmfs_file_operations; |
66 | static struct inode_operations dlmfs_dir_inode_operations; | 66 | static const struct inode_operations dlmfs_dir_inode_operations; |
67 | static struct inode_operations dlmfs_root_inode_operations; | 67 | static const struct inode_operations dlmfs_root_inode_operations; |
68 | static struct inode_operations dlmfs_file_inode_operations; | 68 | static const struct inode_operations dlmfs_file_inode_operations; |
69 | static struct kmem_cache *dlmfs_inode_cache; | 69 | static struct kmem_cache *dlmfs_inode_cache; |
70 | 70 | ||
71 | struct workqueue_struct *user_dlm_worker; | 71 | struct workqueue_struct *user_dlm_worker; |
@@ -547,14 +547,14 @@ static const struct file_operations dlmfs_file_operations = { | |||
547 | .write = dlmfs_file_write, | 547 | .write = dlmfs_file_write, |
548 | }; | 548 | }; |
549 | 549 | ||
550 | static struct inode_operations dlmfs_dir_inode_operations = { | 550 | static const struct inode_operations dlmfs_dir_inode_operations = { |
551 | .create = dlmfs_create, | 551 | .create = dlmfs_create, |
552 | .lookup = simple_lookup, | 552 | .lookup = simple_lookup, |
553 | .unlink = dlmfs_unlink, | 553 | .unlink = dlmfs_unlink, |
554 | }; | 554 | }; |
555 | 555 | ||
556 | /* this way we can restrict mkdir to only the toplevel of the fs. */ | 556 | /* this way we can restrict mkdir to only the toplevel of the fs. */ |
557 | static struct inode_operations dlmfs_root_inode_operations = { | 557 | static const struct inode_operations dlmfs_root_inode_operations = { |
558 | .lookup = simple_lookup, | 558 | .lookup = simple_lookup, |
559 | .mkdir = dlmfs_mkdir, | 559 | .mkdir = dlmfs_mkdir, |
560 | .rmdir = simple_rmdir, | 560 | .rmdir = simple_rmdir, |
@@ -568,7 +568,7 @@ static struct super_operations dlmfs_ops = { | |||
568 | .drop_inode = generic_delete_inode, | 568 | .drop_inode = generic_delete_inode, |
569 | }; | 569 | }; |
570 | 570 | ||
571 | static struct inode_operations dlmfs_file_inode_operations = { | 571 | static const struct inode_operations dlmfs_file_inode_operations = { |
572 | .getattr = simple_getattr, | 572 | .getattr = simple_getattr, |
573 | }; | 573 | }; |
574 | 574 | ||
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 10953a508f2f..f2cd3bf9efb2 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -1365,13 +1365,13 @@ bail: | |||
1365 | return ret; | 1365 | return ret; |
1366 | } | 1366 | } |
1367 | 1367 | ||
1368 | struct inode_operations ocfs2_file_iops = { | 1368 | const struct inode_operations ocfs2_file_iops = { |
1369 | .setattr = ocfs2_setattr, | 1369 | .setattr = ocfs2_setattr, |
1370 | .getattr = ocfs2_getattr, | 1370 | .getattr = ocfs2_getattr, |
1371 | .permission = ocfs2_permission, | 1371 | .permission = ocfs2_permission, |
1372 | }; | 1372 | }; |
1373 | 1373 | ||
1374 | struct inode_operations ocfs2_special_file_iops = { | 1374 | const struct inode_operations ocfs2_special_file_iops = { |
1375 | .setattr = ocfs2_setattr, | 1375 | .setattr = ocfs2_setattr, |
1376 | .getattr = ocfs2_getattr, | 1376 | .getattr = ocfs2_getattr, |
1377 | .permission = ocfs2_permission, | 1377 | .permission = ocfs2_permission, |
diff --git a/fs/ocfs2/file.h b/fs/ocfs2/file.h index 601a453f18a8..cc973f01f6ce 100644 --- a/fs/ocfs2/file.h +++ b/fs/ocfs2/file.h | |||
@@ -28,8 +28,8 @@ | |||
28 | 28 | ||
29 | extern const struct file_operations ocfs2_fops; | 29 | extern const struct file_operations ocfs2_fops; |
30 | extern const struct file_operations ocfs2_dops; | 30 | extern const struct file_operations ocfs2_dops; |
31 | extern struct inode_operations ocfs2_file_iops; | 31 | extern const struct inode_operations ocfs2_file_iops; |
32 | extern struct inode_operations ocfs2_special_file_iops; | 32 | extern const struct inode_operations ocfs2_special_file_iops; |
33 | struct ocfs2_alloc_context; | 33 | struct ocfs2_alloc_context; |
34 | 34 | ||
35 | enum ocfs2_alloc_restarted { | 35 | enum ocfs2_alloc_restarted { |
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index f3d7803b4b46..f7fa52bb3f6b 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c | |||
@@ -2306,7 +2306,7 @@ leave: | |||
2306 | return status; | 2306 | return status; |
2307 | } | 2307 | } |
2308 | 2308 | ||
2309 | struct inode_operations ocfs2_dir_iops = { | 2309 | const struct inode_operations ocfs2_dir_iops = { |
2310 | .create = ocfs2_create, | 2310 | .create = ocfs2_create, |
2311 | .lookup = ocfs2_lookup, | 2311 | .lookup = ocfs2_lookup, |
2312 | .link = ocfs2_link, | 2312 | .link = ocfs2_link, |
diff --git a/fs/ocfs2/namei.h b/fs/ocfs2/namei.h index 8425944fcccd..0975c7b7212b 100644 --- a/fs/ocfs2/namei.h +++ b/fs/ocfs2/namei.h | |||
@@ -26,7 +26,7 @@ | |||
26 | #ifndef OCFS2_NAMEI_H | 26 | #ifndef OCFS2_NAMEI_H |
27 | #define OCFS2_NAMEI_H | 27 | #define OCFS2_NAMEI_H |
28 | 28 | ||
29 | extern struct inode_operations ocfs2_dir_iops; | 29 | extern const struct inode_operations ocfs2_dir_iops; |
30 | 30 | ||
31 | struct dentry *ocfs2_get_parent(struct dentry *child); | 31 | struct dentry *ocfs2_get_parent(struct dentry *child); |
32 | 32 | ||
diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c index 03b0191534d5..40dc1a51f4a9 100644 --- a/fs/ocfs2/symlink.c +++ b/fs/ocfs2/symlink.c | |||
@@ -170,12 +170,12 @@ bail: | |||
170 | return ERR_PTR(status); | 170 | return ERR_PTR(status); |
171 | } | 171 | } |
172 | 172 | ||
173 | struct inode_operations ocfs2_symlink_inode_operations = { | 173 | const struct inode_operations ocfs2_symlink_inode_operations = { |
174 | .readlink = page_readlink, | 174 | .readlink = page_readlink, |
175 | .follow_link = ocfs2_follow_link, | 175 | .follow_link = ocfs2_follow_link, |
176 | .getattr = ocfs2_getattr, | 176 | .getattr = ocfs2_getattr, |
177 | }; | 177 | }; |
178 | struct inode_operations ocfs2_fast_symlink_inode_operations = { | 178 | const struct inode_operations ocfs2_fast_symlink_inode_operations = { |
179 | .readlink = ocfs2_readlink, | 179 | .readlink = ocfs2_readlink, |
180 | .follow_link = ocfs2_follow_link, | 180 | .follow_link = ocfs2_follow_link, |
181 | .getattr = ocfs2_getattr, | 181 | .getattr = ocfs2_getattr, |
diff --git a/fs/ocfs2/symlink.h b/fs/ocfs2/symlink.h index 1ea9e4d9e9eb..65a6c9c6ad51 100644 --- a/fs/ocfs2/symlink.h +++ b/fs/ocfs2/symlink.h | |||
@@ -26,8 +26,8 @@ | |||
26 | #ifndef OCFS2_SYMLINK_H | 26 | #ifndef OCFS2_SYMLINK_H |
27 | #define OCFS2_SYMLINK_H | 27 | #define OCFS2_SYMLINK_H |
28 | 28 | ||
29 | extern struct inode_operations ocfs2_symlink_inode_operations; | 29 | extern const struct inode_operations ocfs2_symlink_inode_operations; |
30 | extern struct inode_operations ocfs2_fast_symlink_inode_operations; | 30 | extern const struct inode_operations ocfs2_fast_symlink_inode_operations; |
31 | 31 | ||
32 | /* | 32 | /* |
33 | * Test whether an inode is a fast symlink. | 33 | * Test whether an inode is a fast symlink. |