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/fat | |
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/fat')
-rw-r--r-- | fs/fat/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 80ff3381fa21..d12cdf2a0406 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c | |||
@@ -855,7 +855,7 @@ enum { | |||
855 | Opt_obsolate, Opt_flush, Opt_tz_utc, Opt_err, | 855 | Opt_obsolate, Opt_flush, Opt_tz_utc, Opt_err, |
856 | }; | 856 | }; |
857 | 857 | ||
858 | static match_table_t fat_tokens = { | 858 | static const match_table_t fat_tokens = { |
859 | {Opt_check_r, "check=relaxed"}, | 859 | {Opt_check_r, "check=relaxed"}, |
860 | {Opt_check_s, "check=strict"}, | 860 | {Opt_check_s, "check=strict"}, |
861 | {Opt_check_n, "check=normal"}, | 861 | {Opt_check_n, "check=normal"}, |
@@ -890,14 +890,14 @@ static match_table_t fat_tokens = { | |||
890 | {Opt_tz_utc, "tz=UTC"}, | 890 | {Opt_tz_utc, "tz=UTC"}, |
891 | {Opt_err, NULL}, | 891 | {Opt_err, NULL}, |
892 | }; | 892 | }; |
893 | static match_table_t msdos_tokens = { | 893 | static const match_table_t msdos_tokens = { |
894 | {Opt_nodots, "nodots"}, | 894 | {Opt_nodots, "nodots"}, |
895 | {Opt_nodots, "dotsOK=no"}, | 895 | {Opt_nodots, "dotsOK=no"}, |
896 | {Opt_dots, "dots"}, | 896 | {Opt_dots, "dots"}, |
897 | {Opt_dots, "dotsOK=yes"}, | 897 | {Opt_dots, "dotsOK=yes"}, |
898 | {Opt_err, NULL} | 898 | {Opt_err, NULL} |
899 | }; | 899 | }; |
900 | static match_table_t vfat_tokens = { | 900 | static const match_table_t vfat_tokens = { |
901 | {Opt_charset, "iocharset=%s"}, | 901 | {Opt_charset, "iocharset=%s"}, |
902 | {Opt_shortname_lower, "shortname=lower"}, | 902 | {Opt_shortname_lower, "shortname=lower"}, |
903 | {Opt_shortname_win95, "shortname=win95"}, | 903 | {Opt_shortname_win95, "shortname=win95"}, |