From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Sat, 18 Aug 2007 16:00:04 +0100
Subject: [Cluster-devel] [PATCH] [GFS2] bz253289 Add NULL entry to
	token table
In-Reply-To: <20070818012206.GH24772@ether.msp.redhat.com>
References: <20070818012206.GH24772@ether.msp.redhat.com>
Message-ID: <1187449204.3354.0.camel@menhir.chygwyn.com>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Hi,

Now in the -nmw git tree. Thanks,

Steve.

On Fri, 2007-08-17 at 20:22 -0500, Benjamin Marzinski wrote:
> match_token() was returning garbage data instead of a fail value. This data
> happened to match a valid option id for an option that required an argument (in
> this case, lockproto=%s) For match_token() to correctly fail if the option
> doesn't match any of the tokens, the token table must end with a NULL entry.
> This patch adds the NULL entry.
> 
> Signed-off-by: Benjamin E. Marzinski <bmarzins@redhat.com>
> plain text document attachment (mount_panic.patch)
> diff -urpN --exclude-from=gfs2-2.6-nmw/Documentation/dontdiff gfs2-2.6-nmw/fs/gfs2/mount.c gfs2-2.6-nmw-patched/fs/gfs2/mount.c
> --- gfs2-2.6-nmw/fs/gfs2/mount.c	2007-08-13 16:18:01.000000000 -0500
> +++ gfs2-2.6-nmw-patched/fs/gfs2/mount.c	2007-08-17 12:04:36.000000000 -0500
> @@ -42,6 +42,7 @@ enum {
>  	Opt_nosuiddir,
>  	Opt_data_writeback,
>  	Opt_data_ordered,
> +	Opt_err,
>  };
>  
>  static match_table_t tokens = {
> @@ -64,7 +65,8 @@ static match_table_t tokens = {
>  	{Opt_suiddir, "suiddir"},
>  	{Opt_nosuiddir, "nosuiddir"},
>  	{Opt_data_writeback, "data=writeback"},
> -	{Opt_data_ordered, "data=ordered"}
> +	{Opt_data_ordered, "data=ordered"},
> +	{Opt_err, NULL}
>  };
>  
>  /**
> @@ -237,6 +239,7 @@ int gfs2_mount_args(struct gfs2_sbd *sdp
>  		case Opt_data_ordered:
>  			args->ar_data = GFS2_DATA_ORDERED;
>  			break;
> +		case Opt_err:
>  		default:
>  			fs_info(sdp, "unknown option: %s\n", o);
>  			error = -EINVAL;