aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/super.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2008-10-13 05:46:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-13 13:10:37 -0400
commita447c0932445f92ce6f4c1bd020f62c5097a7842 (patch)
treebacf05bc7f9764515cdd6f7dc5e2254776b4f160 /fs/nfs/super.c
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/nfs/super.c')
-rw-r--r--fs/nfs/super.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index e9b20173fef3..ffb697416cb1 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -98,7 +98,7 @@ enum {
98 Opt_err 98 Opt_err
99}; 99};
100 100
101static match_table_t nfs_mount_option_tokens = { 101static const match_table_t nfs_mount_option_tokens = {
102 { Opt_userspace, "bg" }, 102 { Opt_userspace, "bg" },
103 { Opt_userspace, "fg" }, 103 { Opt_userspace, "fg" },
104 { Opt_userspace, "retry=%s" }, 104 { Opt_userspace, "retry=%s" },
@@ -163,7 +163,7 @@ enum {
163 Opt_xprt_err 163 Opt_xprt_err
164}; 164};
165 165
166static match_table_t nfs_xprt_protocol_tokens = { 166static const match_table_t nfs_xprt_protocol_tokens = {
167 { Opt_xprt_udp, "udp" }, 167 { Opt_xprt_udp, "udp" },
168 { Opt_xprt_tcp, "tcp" }, 168 { Opt_xprt_tcp, "tcp" },
169 { Opt_xprt_rdma, "rdma" }, 169 { Opt_xprt_rdma, "rdma" },
@@ -180,7 +180,7 @@ enum {
180 Opt_sec_err 180 Opt_sec_err
181}; 181};
182 182
183static match_table_t nfs_secflavor_tokens = { 183static const match_table_t nfs_secflavor_tokens = {
184 { Opt_sec_none, "none" }, 184 { Opt_sec_none, "none" },
185 { Opt_sec_none, "null" }, 185 { Opt_sec_none, "null" },
186 { Opt_sec_sys, "sys" }, 186 { Opt_sec_sys, "sys" },