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

Commit 4d5077f1 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Eric Van Hensbergen
Browse files

fs/9p: Cleanup option parsing in 9p 



Instead of saying all integer argument option should be listed in the beginning
move integer parsing to each option type.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent 5635fd0c

fs/9p/v9fs.c

+26 −7
Original line number Diff line number Diff line
@@ -132,21 +132,19 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts) 
	options = tmp_options;



	while ((p = strsep(&options, ",")) != NULL) {

		int token;

		int token, r;

		if (!*p)

			continue;

		token = match_token(p, tokens, args);

		if (token < Opt_uname) {

			int r = match_int(&args[0], &option);

		switch (token) {

		case Opt_debug:

			r = match_int(&args[0], &option);

			if (r < 0) {

				P9_DPRINTK(P9_DEBUG_ERROR,

					   "integer field, but no integer?\n");

				ret = r;

				continue;

			}

		}

		switch (token) {

		case Opt_debug:

			v9ses->debug = option;

#ifdef CONFIG_NET_9P_DEBUG

			p9_debug_level = option;
@@ -154,12 +152,33 @@ static int v9fs_parse_options(struct v9fs_session_info *v9ses, char *opts) 
			break;



		case Opt_dfltuid:

			r = match_int(&args[0], &option);

			if (r < 0) {

				P9_DPRINTK(P9_DEBUG_ERROR,

					   "integer field, but no integer?\n");

				ret = r;

				continue;

			}

			v9ses->dfltuid = option;

			break;

		case Opt_dfltgid:

			r = match_int(&args[0], &option);

			if (r < 0) {

				P9_DPRINTK(P9_DEBUG_ERROR,

					   "integer field, but no integer?\n");

				ret = r;

				continue;

			}

			v9ses->dfltgid = option;

			break;

		case Opt_afid:

			r = match_int(&args[0], &option);

			if (r < 0) {

				P9_DPRINTK(P9_DEBUG_ERROR,

					   "integer field, but no integer?\n");

				ret = r;

				continue;

			}

			v9ses->afid = option;

			break;

		case Opt_uname:

net/9p/client.c

+5 −7
Original line number Diff line number Diff line
@@ -123,21 +123,19 @@ static int parse_opts(char *opts, struct p9_client *clnt) 
	options = tmp_options;



	while ((p = strsep(&options, ",")) != NULL) {

		int token;

		int token, r;

		if (!*p)

			continue;

		token = match_token(p, tokens, args);

		if (token < Opt_trans) {

			int r = match_int(&args[0], &option);

		switch (token) {

		case Opt_msize:

			r = match_int(&args[0], &option);

			if (r < 0) {

				P9_DPRINTK(P9_DEBUG_ERROR,

					   "integer field, but no integer?\n");

				ret = r;

				continue;

			}

		}

		switch (token) {

		case Opt_msize:

			clnt->msize = option;

			break;

		case Opt_trans: