summaryrefslogtreecommitdiffstats
path: root/fs/fuse/inode.c
diff options
context:
space:
mode:
authorSteven Whitehouse2008-10-13 11:46:57 +0200
committerLinus Torvalds2008-10-13 19:10:37 +0200
commita447c0932445f92ce6f4c1bd020f62c5097a7842 (patch)
treebacf05bc7f9764515cdd6f7dc5e2254776b4f160 /fs/fuse/inode.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/coo... (diff)
downloadkernel-qcow2-linux-a447c0932445f92ce6f4c1bd020f62c5097a7842.tar.gz
kernel-qcow2-linux-a447c0932445f92ce6f4c1bd020f62c5097a7842.tar.xz
kernel-qcow2-linux-a447c0932445f92ce6f4c1bd020f62c5097a7842.zip
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/fuse/inode.c')
-rw-r--r--fs/fuse/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index d2249f174e20..6a84388cacff 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -354,7 +354,7 @@ enum {
OPT_ERR
};
-static match_table_t tokens = {
+static const match_table_t tokens = {
{OPT_FD, "fd=%u"},
{OPT_ROOTMODE, "rootmode=%o"},
{OPT_USER_ID, "user_id=%u"},