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

Commit 9a5ad138 authored by Benjamin Marzinski's avatar Benjamin Marzinski Committed by Steven Whitehouse
Browse files

[GFS2] Add NULL entry to token table 



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: default avatarBenjamin E. Marzinski <bmarzins@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 382e6e25

fs/gfs2/mount.c

+4 −1
Original line number Diff line number Diff line
@@ -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, char *data_arg, int remount) 
		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;