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

Commit f9247273 authored by Steven Whitehouse's avatar Steven Whitehouse Committed by Linus Torvalds
Browse files

UFS: add const to parser token table 



This patch adds a "const" to the parser token table. I've done an
allmodconfig build to see if this produces any warnings/failures and the
patch includes a fix for the only warning that was produced.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Acked-by: default avatarAlexander Viro <aviro@redhat.com>
Acked-by: default avatarEvgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b340e8a5

fs/ufs/super.c

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

	struct match_token *tp = tokens;

	const 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;

include/linux/parser.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ struct match_token { 
	const char *pattern;

	const char *pattern;

};

};





typedef struct match_token match_table_t[];

typedef const 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};