Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[firefly-linux-kernel-4.4.55.git] / net / 9p / trans_fd.c

diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index aa5672b15eae2cc2c8ae638ad662277070e58079..4a9084395d358320840a3fdf7398da8b0d85b09b 100644 (file)
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -716,7 +716,6 @@ static int parse_opts(char *params, struct p9_fd_opts *opts)
        substring_t args[MAX_OPT_ARGS];
        int option;
        char *options, *tmp_options;
-       int ret;
 
        opts->port = P9_PORT;
        opts->rfd = ~0;
@@ -744,7 +743,6 @@ static int parse_opts(char *params, struct p9_fd_opts *opts)
                        if (r < 0) {
                                P9_DPRINTK(P9_DEBUG_ERROR,
                                "integer field, but no integer?\n");
-                               ret = r;
                                continue;
                        }
                }