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: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index ef96618861129ea023f6d9b4e0b77c65b452b997..2b78014a124a2522007d11e97eda94b3d82ab8af 100644 (file)
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -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");
+                                          "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:

diff --git a/net/9p/client.c b/net/9p/client.c
index 9eadadb0a6987de0ff54840fce2153a5ad65c7a5..0edee4de608a0f8b18be71491bb74940219193e5 100644 (file)
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -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");
+                                          "integer field, but no integer?\n");
                                ret = r;
                                continue;
                        }
-               }
-               switch (token) {
-               case Opt_msize:
                        clnt->msize = option;
                        break;
                case Opt_trans: