2008-07-17 13:25:04

by Steven Whitehouse

[permalink] [raw]
Subject: [RFC] parser: add const to parser token table

Hi,

Any objections to the following patch? If not I'll send it on to Linus.

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: Steven Whitehouse <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Evgeniy Dushistov <[email protected]>


diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index 85b22b5..506f724 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -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);
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)
++tp;
diff --git a/include/linux/parser.h b/include/linux/parser.h
index 7dcd050..cc554ca 100644
--- a/include/linux/parser.h
+++ b/include/linux/parser.h
@@ -14,7 +14,7 @@ struct match_token {
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 */
enum {MAX_OPT_ARGS = 3};


2008-07-20 12:37:10

by Evgeniy Dushistov

[permalink] [raw]
Subject: Re: [RFC] parser: add const to parser token table

On Thu, Jul 17, 2008 at 02:22:52PM +0100, Steven Whitehouse wrote:
> Hi,
>
> Any objections to the following patch? If not I'll send it on to Linus.
>
> 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: Steven Whitehouse <[email protected]>
> Cc: Alexander Viro <[email protected]>
> Cc: Evgeniy Dushistov <[email protected]>
>
>
> diff --git a/fs/ufs/super.c b/fs/ufs/super.c
> index 85b22b5..506f724 100644
> --- a/fs/ufs/super.c
> +++ b/fs/ufs/super.c
> @@ -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);
> 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)
> ++tp;
> diff --git a/include/linux/parser.h b/include/linux/parser.h
> index 7dcd050..cc554ca 100644
> --- a/include/linux/parser.h
> +++ b/include/linux/parser.h
> @@ -14,7 +14,7 @@ struct match_token {
> 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 */
> enum {MAX_OPT_ARGS = 3};
>
Acked-by: Evgeniy Dushistov <[email protected]>

--
/Evgeniy

2008-07-20 12:42:27

by Alexander Viro

[permalink] [raw]
Subject: Re: [RFC] parser: add const to parser token table

On Thu, Jul 17, 2008 at 02:22:52PM +0100, Steven Whitehouse wrote:
> Hi,
>
> Any objections to the following patch? If not I'll send it on to Linus.
>
> 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: Steven Whitehouse <[email protected]>
> Cc: Alexander Viro <[email protected]>
> Cc: Evgeniy Dushistov <[email protected]>

ACK