summaryrefslogtreecommitdiff
path: root/fs/ufs
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2008-10-13 10:46:57 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-13 10:10:37 -0700
commita447c0932445f92ce6f4c1bd020f62c5097a7842 (patch)
treebacf05bc7f9764515cdd6f7dc5e2254776b4f160 /fs/ufs
parent54cebc68c81eacac41a21bdfe99dc889d3882c60 (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')
-rw-r--r--fs/ufs/super.c4
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 {
Opt_err
};
-static match_table_t tokens = {
+static const match_table_t tokens = {
{Opt_type_old, "ufstype=old"},
{Opt_type_sunx86, "ufstype=sunx86"},
{Opt_type_sun, "ufstype=sun"},
@@ -1233,7 +1233,7 @@ static int ufs_show_options(struct seq_file *seq, struct vfsmount *vfs)
{
struct ufs_sb_info *sbi = UFS_SB(vfs->mnt_sb);
unsigned mval = sbi->s_mount_opt & UFS_MOUNT_UFSTYPE;
- struct match_token *tp = tokens;
+ const struct match_token *tp = tokens;
while (tp->token != Opt_onerror_panic && tp->token != mval)
++tp;