iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "UFS: add const to parser token table"

Browse Source 
This reverts commit f9247273cb69ba101877e946d2d83044409cc8c5 (and
fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 - "fix fs/nfs/nfsroot.c
compilation" - that fixed a missed conversion).

The changes cause problems for at least the sparc build.  Let's re-do
them when the exact issues are resolved.

Requested-by: Andrew Morton <akpm@linux-foundation.org>
Requested-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2008-08-04 16:50:38 -07:00
parent fca082c9f1
commit 1a3f7d98e5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/nfsroot.c
View File

@ -127,7 +127,7 @@ enum {
Opt_err Opt_err
}; };
static match_table_t __initconst tokens = { static match_table_t __initdata tokens = {
{Opt_port, "port=%u"}, {Opt_port, "port=%u"},
{Opt_rsize, "rsize=%u"}, {Opt_rsize, "rsize=%u"},
{Opt_wsize, "wsize=%u"}, {Opt_wsize, "wsize=%u"},

2
fs/ufs/super.c
View File

@ -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); struct ufs_sb_info *sbi = UFS_SB(vfs->mnt_sb);
unsigned mval = sbi->s_mount_opt & UFS_MOUNT_UFSTYPE; unsigned mval = sbi->s_mount_opt & UFS_MOUNT_UFSTYPE;
const struct match_token *tp = tokens; struct match_token *tp = tokens;
while (tp->token != Opt_onerror_panic && tp->token != mval) while (tp->token != Opt_onerror_panic && tp->token != mval)
++tp; ++tp;

2
include/linux/parser.h
View File

@ -14,7 +14,7 @@ struct match_token {
const char *pattern; const char *pattern;
}; };
typedef const struct match_token match_table_t[]; typedef struct match_token match_table_t[];
/* Maximum number of arguments that match_token will find in a pattern */ /* Maximum number of arguments that match_token will find in a pattern */
enum {MAX_OPT_ARGS = 3}; enum {MAX_OPT_ARGS = 3};