diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2008-10-13 05:46:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 13:10:37 -0400 |
commit | a447c0932445f92ce6f4c1bd020f62c5097a7842 (patch) | |
tree | bacf05bc7f9764515cdd6f7dc5e2254776b4f160 /fs/ufs/super.c | |
parent | 54cebc68c81eacac41a21bdfe99dc889d3882c60 (diff) |
vfs: Use const for kernel parser table
This is a much better version of a previous patch to make the parser
tables constant. Rather than changing the typedef, we put the "const" in
all the various places where its required, allowing the __initconst
exception for nfsroot which was the cause of the previous trouble.
This was posted for review some time ago and I believe its been in -mm
since then.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: Alexander Viro <aviro@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ufs/super.c')
-rw-r--r-- | fs/ufs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 3141969b456d..e65212dfb60e 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c | |||
@@ -309,7 +309,7 @@ enum { | |||
309 | Opt_err | 309 | Opt_err |
310 | }; | 310 | }; |
311 | 311 | ||
312 | static match_table_t tokens = { | 312 | static const match_table_t tokens = { |
313 | {Opt_type_old, "ufstype=old"}, | 313 | {Opt_type_old, "ufstype=old"}, |
314 | {Opt_type_sunx86, "ufstype=sunx86"}, | 314 | {Opt_type_sunx86, "ufstype=sunx86"}, |
315 | {Opt_type_sun, "ufstype=sun"}, | 315 | {Opt_type_sun, "ufstype=sun"}, |
@@ -1233,7 +1233,7 @@ static int ufs_show_options(struct seq_file *seq, struct vfsmount *vfs) | |||
1233 | { | 1233 | { |
1234 | struct ufs_sb_info *sbi = UFS_SB(vfs->mnt_sb); | 1234 | struct ufs_sb_info *sbi = UFS_SB(vfs->mnt_sb); |
1235 | unsigned mval = sbi->s_mount_opt & UFS_MOUNT_UFSTYPE; | 1235 | unsigned mval = sbi->s_mount_opt & UFS_MOUNT_UFSTYPE; |
1236 | struct match_token *tp = tokens; | 1236 | const struct match_token *tp = tokens; |
1237 | 1237 | ||
1238 | while (tp->token != Opt_onerror_panic && tp->token != mval) | 1238 | while (tp->token != Opt_onerror_panic && tp->token != mval) |
1239 | ++tp; | 1239 | ++tp; |