Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a3f7d98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "UFS: add const to parser token table" 



This reverts commit f9247273 (and
fb2e405f - "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: default avatarAndrew Morton <akpm@linux-foundation.org>
Requested-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fca082c9

fs/nfs/nfsroot.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ enum { 
	Opt_err

};



static match_table_t __initconst tokens = {

static match_table_t __initdata tokens = {

	{Opt_port, "port=%u"},

	{Opt_rsize, "rsize=%u"},

	{Opt_wsize, "wsize=%u"},

fs/ufs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	const struct match_token *tp = tokens;

	struct match_token *tp = tokens;



	while (tp->token != Opt_onerror_panic && tp->token != mval)

		++tp;

include/linux/parser.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ struct match_token { 
	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 */

enum {MAX_OPT_ARGS = 3};