Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

[pandora-kernel.git] / net / sunrpc / clnt.c

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index d3fe866..c5347d2 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -97,8 +97,7 @@ static int
 rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
 {
        static uint32_t clntid;
-       struct nameidata nd;
-       struct path path;
+       struct path path, dir;
        char name[15];
        struct qstr q = {
                .name = name,
@@ -113,7 +112,7 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
        path.mnt = rpc_get_mount();
        if (IS_ERR(path.mnt))
                return PTR_ERR(path.mnt);
-       error = vfs_path_lookup(path.mnt->mnt_root, path.mnt, dir_name, 0, &nd);
+       error = vfs_path_lookup(path.mnt->mnt_root, path.mnt, dir_name, 0, &dir);
        if (error)
                goto err;
 
@@ -121,7 +120,7 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
                q.len = snprintf(name, sizeof(name), "clnt%x", (unsigned int)clntid++);
                name[sizeof(name) - 1] = '\0';
                q.hash = full_name_hash(q.name, q.len);
-               path.dentry = rpc_create_client_dir(nd.path.dentry, &q, clnt);
+               path.dentry = rpc_create_client_dir(dir.dentry, &q, clnt);
                if (!IS_ERR(path.dentry))
                        break;
                error = PTR_ERR(path.dentry);
@@ -132,11 +131,11 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
                        goto err_path_put;
                }
        }
-       path_put(&nd.path);
+       path_put(&dir);
        clnt->cl_path = path;
        return 0;
 err_path_put:
-       path_put(&nd.path);
+       path_put(&dir);
 err:
        rpc_put_mount();
        return error;
@@ -1665,19 +1664,18 @@ rpc_verify_header(struct rpc_task *task)
                if (--len < 0)
                        goto out_overflow;
                switch ((n = ntohl(*p++))) {
-                       case RPC_AUTH_ERROR:
-                               break;
-                       case RPC_MISMATCH:
-                               dprintk("RPC: %5u %s: RPC call version "
-                                               "mismatch!\n",
-                                               task->tk_pid, __func__);
-                               error = -EPROTONOSUPPORT;
-                               goto out_err;
-                       default:
-                               dprintk("RPC: %5u %s: RPC call rejected, "
-                                               "unknown error: %x\n",
-                                               task->tk_pid, __func__, n);
-                               goto out_eio;
+               case RPC_AUTH_ERROR:
+                       break;
+               case RPC_MISMATCH:
+                       dprintk("RPC: %5u %s: RPC call version mismatch!\n",
+                               task->tk_pid, __func__);
+                       error = -EPROTONOSUPPORT;
+                       goto out_err;
+               default:
+                       dprintk("RPC: %5u %s: RPC call rejected, "
+                               "unknown error: %x\n",
+                               task->tk_pid, __func__, n);
+                       goto out_eio;
                }
                if (--len < 0)
                        goto out_overflow;