Patched in Tegra support.

1 files changed, 172 insertions, 563 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 507b5e84fbd..c5347d29cfb 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -17,6 +17,7 @@
  *  Copyright (C) 1995,1996 Olaf Kirch <okir@monad.swb.de>
  */
 
+#include <asm/system.h>
 
 #include <linux/module.h>
 #include <linux/types.h>
@@ -30,16 +31,13 @@
 #include <linux/in.h>
 #include <linux/in6.h>
 #include <linux/un.h>
-#include <linux/rcupdate.h>
 
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/rpc_pipe_fs.h>
 #include <linux/sunrpc/metrics.h>
 #include <linux/sunrpc/bc_xprt.h>
-#include <trace/events/sunrpc.h>
 
 #include "sunrpc.h"
-#include "netns.h"
 
 #ifdef RPC_DEBUG
 # define RPCDBG_FACILITY        RPCDBG_CALL
@@ -52,6 +50,8 @@
 /*
  * All RPC clients are linked into this list
  */
+static LIST_HEAD(all_clients);
+static DEFINE_SPINLOCK(rpc_client_lock);
 
 static DECLARE_WAIT_QUEUE_HEAD(destroy_wait);
 
@@ -81,222 +81,82 @@ static int	rpc_ping(struct rpc_clnt *clnt);
 
 static void rpc_register_client(struct rpc_clnt *clnt)
 {
-        struct net *net = rpc_net_ns(clnt);
-        struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
-
-        spin_lock(&sn->rpc_client_lock);
-        list_add(&clnt->cl_clients, &sn->all_clients);
-        spin_unlock(&sn->rpc_client_lock);
+        spin_lock(&rpc_client_lock);
+        list_add(&clnt->cl_clients, &all_clients);
+        spin_unlock(&rpc_client_lock);
 }
 
 static void rpc_unregister_client(struct rpc_clnt *clnt)
 {
-        struct net *net = rpc_net_ns(clnt);
-        struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
-
-        spin_lock(&sn->rpc_client_lock);
+        spin_lock(&rpc_client_lock);
         list_del(&clnt->cl_clients);
-        spin_unlock(&sn->rpc_client_lock);
-}
-
-static void __rpc_clnt_remove_pipedir(struct rpc_clnt *clnt)
-{
-        if (clnt->cl_dentry) {
-                if (clnt->cl_auth && clnt->cl_auth->au_ops->pipes_destroy)
-                        clnt->cl_auth->au_ops->pipes_destroy(clnt->cl_auth);
-                rpc_remove_client_dir(clnt->cl_dentry);
-        }
-        clnt->cl_dentry = NULL;
+        spin_unlock(&rpc_client_lock);
 }
 
-static void rpc_clnt_remove_pipedir(struct rpc_clnt *clnt)
-{
-        struct net *net = rpc_net_ns(clnt);
-        struct super_block *pipefs_sb;
-
-        pipefs_sb = rpc_get_sb_net(net);
-        if (pipefs_sb) {
-                __rpc_clnt_remove_pipedir(clnt);
-                rpc_put_sb_net(net);
-        }
-}
-
-static struct dentry *rpc_setup_pipedir_sb(struct super_block *sb,
-                                    struct rpc_clnt *clnt,
-                                    const char *dir_name)
+static int
+rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
 {
         static uint32_t clntid;
+        struct path path, dir;
         char name[15];
-        struct qstr q = { .name = name };
-        struct dentry *dir, *dentry;
+        struct qstr q = {
+                .name = name,
+        };
         int error;
 
-        dir = rpc_d_lookup_sb(sb, dir_name);
-        if (dir == NULL) {
-                pr_info("RPC: pipefs directory doesn't exist: %s\n", dir_name);
-                return dir;
-        }
+        clnt->cl_path.mnt = ERR_PTR(-ENOENT);
+        clnt->cl_path.dentry = ERR_PTR(-ENOENT);
+        if (dir_name == NULL)
+                return 0;
+
+        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, &dir);
+        if (error)
+                goto err;
+
         for (;;) {
                 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);
-                dentry = rpc_create_client_dir(dir, &q, clnt);
-                if (!IS_ERR(dentry))
+                path.dentry = rpc_create_client_dir(dir.dentry, &q, clnt);
+                if (!IS_ERR(path.dentry))
                         break;
-                error = PTR_ERR(dentry);
+                error = PTR_ERR(path.dentry);
                 if (error != -EEXIST) {
                         printk(KERN_INFO "RPC: Couldn't create pipefs entry"
                                         " %s/%s, error %d\n",
                                         dir_name, name, error);
-                        break;
+                        goto err_path_put;
                 }
         }
-        dput(dir);
-        return dentry;
-}
-
-static int
-rpc_setup_pipedir(struct rpc_clnt *clnt, const char *dir_name)
-{
-        struct net *net = rpc_net_ns(clnt);
-        struct super_block *pipefs_sb;
-        struct dentry *dentry;
-
-        clnt->cl_dentry = NULL;
-        if (dir_name == NULL)
-                return 0;
-        pipefs_sb = rpc_get_sb_net(net);
-        if (!pipefs_sb)
-                return 0;
-        dentry = rpc_setup_pipedir_sb(pipefs_sb, clnt, dir_name);
-        rpc_put_sb_net(net);
-        if (IS_ERR(dentry))
-                return PTR_ERR(dentry);
-        clnt->cl_dentry = dentry;
-        return 0;
-}
-
-static inline int rpc_clnt_skip_event(struct rpc_clnt *clnt, unsigned long event)
-{
-        if (((event == RPC_PIPEFS_MOUNT) && clnt->cl_dentry) ||
-            ((event == RPC_PIPEFS_UMOUNT) && !clnt->cl_dentry))
-                return 1;
+        path_put(&dir);
+        clnt->cl_path = path;
         return 0;
-}
-
-static int __rpc_clnt_handle_event(struct rpc_clnt *clnt, unsigned long event,
-                                   struct super_block *sb)
-{
-        struct dentry *dentry;
-        int err = 0;
-
-        switch (event) {
-        case RPC_PIPEFS_MOUNT:
-                dentry = rpc_setup_pipedir_sb(sb, clnt,
-                                              clnt->cl_program->pipe_dir_name);
-                if (!dentry)
-                        return -ENOENT;
-                if (IS_ERR(dentry))
-                        return PTR_ERR(dentry);
-                clnt->cl_dentry = dentry;
-                if (clnt->cl_auth->au_ops->pipes_create) {
-                        err = clnt->cl_auth->au_ops->pipes_create(clnt->cl_auth);
-                        if (err)
-                                __rpc_clnt_remove_pipedir(clnt);
-                }
-                break;
-        case RPC_PIPEFS_UMOUNT:
-                __rpc_clnt_remove_pipedir(clnt);
-                break;
-        default:
-                printk(KERN_ERR "%s: unknown event: %ld\n", __func__, event);
-                return -ENOTSUPP;
-        }
-        return err;
-}
-
-static int __rpc_pipefs_event(struct rpc_clnt *clnt, unsigned long event,
-                                struct super_block *sb)
-{
-        int error = 0;
-
-        for (;; clnt = clnt->cl_parent) {
-                if (!rpc_clnt_skip_event(clnt, event))
-                        error = __rpc_clnt_handle_event(clnt, event, sb);
-                if (error || clnt == clnt->cl_parent)
-                        break;
-        }
-        return error;
-}
-
-static struct rpc_clnt *rpc_get_client_for_event(struct net *net, int event)
-{
-        struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
-        struct rpc_clnt *clnt;
-
-        spin_lock(&sn->rpc_client_lock);
-        list_for_each_entry(clnt, &sn->all_clients, cl_clients) {
-                if (clnt->cl_program->pipe_dir_name == NULL)
-                        continue;
-                if (rpc_clnt_skip_event(clnt, event))
-                        continue;
-                if (atomic_inc_not_zero(&clnt->cl_count) == 0)
-                        continue;
-                spin_unlock(&sn->rpc_client_lock);
-                return clnt;
-        }
-        spin_unlock(&sn->rpc_client_lock);
-        return NULL;
-}
-
-static int rpc_pipefs_event(struct notifier_block *nb, unsigned long event,
-                            void *ptr)
-{
-        struct super_block *sb = ptr;
-        struct rpc_clnt *clnt;
-        int error = 0;
-
-        while ((clnt = rpc_get_client_for_event(sb->s_fs_info, event))) {
-                error = __rpc_pipefs_event(clnt, event, sb);
-                rpc_release_client(clnt);
-                if (error)
-                        break;
-        }
+err_path_put:
+        path_put(&dir);
+err:
+        rpc_put_mount();
         return error;
 }
 
-static struct notifier_block rpc_clients_block = {
-        .notifier_call  = rpc_pipefs_event,
-        .priority       = SUNRPC_PIPEFS_RPC_PRIO,
-};
-
-int rpc_clients_notifier_register(void)
-{
-        return rpc_pipefs_notifier_register(&rpc_clients_block);
-}
-
-void rpc_clients_notifier_unregister(void)
-{
-        return rpc_pipefs_notifier_unregister(&rpc_clients_block);
-}
-
-static void rpc_clnt_set_nodename(struct rpc_clnt *clnt, const char *nodename)
-{
-        clnt->cl_nodelen = strlen(nodename);
-        if (clnt->cl_nodelen > UNX_MAXNODENAME)
-                clnt->cl_nodelen = UNX_MAXNODENAME;
-        memcpy(clnt->cl_nodename, nodename, clnt->cl_nodelen);
-}
-
 static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, struct rpc_xprt *xprt)
 {
-        const struct rpc_program *program = args->program;
-        const struct rpc_version *version;
+        struct rpc_program      *program = args->program;
+        struct rpc_version      *version;
         struct rpc_clnt         *clnt = NULL;
         struct rpc_auth         *auth;
         int err;
+        size_t len;
 
         /* sanity check the name before trying to print it */
+        err = -EINVAL;
+        len = strlen(args->servername);
+        if (len > RPC_MAXNETNAMELEN)
+                goto out_no_rpciod;
+        len++;
+
         dprintk("RPC:       creating %s client for %s (xprt %p)\n",
                         program->name, args->servername, xprt);
 
@@ -319,7 +179,17 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, stru
                 goto out_err;
         clnt->cl_parent = clnt;
 
-        rcu_assign_pointer(clnt->cl_xprt, xprt);
+        clnt->cl_server = clnt->cl_inline_name;
+        if (len > sizeof(clnt->cl_inline_name)) {
+                char *buf = kmalloc(len, GFP_KERNEL);
+                if (buf != NULL)
+                        clnt->cl_server = buf;
+                else
+                        len = sizeof(clnt->cl_inline_name);
+        }
+        strlcpy(clnt->cl_server, args->servername, len);
+
+        clnt->cl_xprt     = xprt;
         clnt->cl_procinfo = version->procs;
         clnt->cl_maxproc  = version->nrprocs;
         clnt->cl_protname = program->name;
@@ -334,7 +204,7 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, stru
         INIT_LIST_HEAD(&clnt->cl_tasks);
         spin_lock_init(&clnt->cl_lock);
 
-        if (!xprt_bound(xprt))
+        if (!xprt_bound(clnt->cl_xprt))
                 clnt->cl_autobind = 1;
 
         clnt->cl_timeout = xprt->timeout;
@@ -368,17 +238,25 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, stru
         }
 
         /* save the nodename */
-        rpc_clnt_set_nodename(clnt, utsname()->nodename);
+        clnt->cl_nodelen = strlen(init_utsname()->nodename);
+        if (clnt->cl_nodelen > UNX_MAXNODENAME)
+                clnt->cl_nodelen = UNX_MAXNODENAME;
+        memcpy(clnt->cl_nodename, init_utsname()->nodename, clnt->cl_nodelen);
         rpc_register_client(clnt);
         return clnt;
 
 out_no_auth:
-        rpc_clnt_remove_pipedir(clnt);
+        if (!IS_ERR(clnt->cl_path.dentry)) {
+                rpc_remove_client_dir(clnt->cl_path.dentry);
+                rpc_put_mount();
+        }
 out_no_path:
         kfree(clnt->cl_principal);
 out_no_principal:
         rpc_free_iostats(clnt->cl_metrics);
 out_no_stats:
+        if (clnt->cl_server != clnt->cl_inline_name)
+                kfree(clnt->cl_server);
         kfree(clnt);
 out_err:
         xprt_put(xprt);
@@ -388,7 +266,7 @@ out_no_rpciod:
         return ERR_PTR(err);
 }
 
-/**
+/*
  * rpc_create - create an RPC client and transport with one call
  * @args: rpc_clnt create argument structure
  *
@@ -408,7 +286,6 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
                 .srcaddr = args->saddress,
                 .dstaddr = args->address,
                 .addrlen = args->addrsize,
-                .servername = args->servername,
                 .bc_xprt = args->bc_xprt,
         };
         char servername[48];
@@ -417,7 +294,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
          * If the caller chooses not to specify a hostname, whip
          * up a string representation of the passed-in address.
          */
-        if (xprtargs.servername == NULL) {
+        if (args->servername == NULL) {
                 struct sockaddr_un *sun =
                                 (struct sockaddr_un *)args->address;
                 struct sockaddr_in *sin =
@@ -444,7 +321,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
                          * address family isn't recognized. */
                         return ERR_PTR(-EINVAL);
                 }
-                xprtargs.servername = servername;
+                args->servername = servername;
         }
 
         xprt = xprt_create_transport(&xprtargs);
@@ -493,86 +370,52 @@ EXPORT_SYMBOL_GPL(rpc_create);
  * same transport while varying parameters such as the authentication
  * flavour.
  */
-static struct rpc_clnt *__rpc_clone_client(struct rpc_create_args *args,
-                                           struct rpc_clnt *clnt)
+struct rpc_clnt *
+rpc_clone_client(struct rpc_clnt *clnt)
 {
-        struct rpc_xprt *xprt;
         struct rpc_clnt *new;
-        int err;
-
-        err = -ENOMEM;
-        rcu_read_lock();
-        xprt = xprt_get(rcu_dereference(clnt->cl_xprt));
-        rcu_read_unlock();
-        if (xprt == NULL)
-                goto out_err;
-        args->servername = xprt->servername;
+        int err = -ENOMEM;
 
-        new = rpc_new_client(args, xprt);
-        if (IS_ERR(new)) {
-                err = PTR_ERR(new);
-                goto out_put;
-        }
-
-        atomic_inc(&clnt->cl_count);
+        new = kmemdup(clnt, sizeof(*new), GFP_KERNEL);
+        if (!new)
+                goto out_no_clnt;
         new->cl_parent = clnt;
-
         /* Turn off autobind on clones */
         new->cl_autobind = 0;
-        new->cl_softrtry = clnt->cl_softrtry;
-        new->cl_discrtry = clnt->cl_discrtry;
-        new->cl_chatty = clnt->cl_chatty;
+        INIT_LIST_HEAD(&new->cl_tasks);
+        spin_lock_init(&new->cl_lock);
+        rpc_init_rtt(&new->cl_rtt_default, clnt->cl_timeout->to_initval);
+        new->cl_metrics = rpc_alloc_iostats(clnt);
+        if (new->cl_metrics == NULL)
+                goto out_no_stats;
+        if (clnt->cl_principal) {
+                new->cl_principal = kstrdup(clnt->cl_principal, GFP_KERNEL);
+                if (new->cl_principal == NULL)
+                        goto out_no_principal;
+        }
+        atomic_set(&new->cl_count, 1);
+        err = rpc_setup_pipedir(new, clnt->cl_program->pipe_dir_name);
+        if (err != 0)
+                goto out_no_path;
+        if (new->cl_auth)
+                atomic_inc(&new->cl_auth->au_count);
+        xprt_get(clnt->cl_xprt);
+        atomic_inc(&clnt->cl_count);
+        rpc_register_client(new);
+        rpciod_up();
         return new;
-
-out_put:
-        xprt_put(xprt);
-out_err:
+out_no_path:
+        kfree(new->cl_principal);
+out_no_principal:
+        rpc_free_iostats(new->cl_metrics);
+out_no_stats:
+        kfree(new);
+out_no_clnt:
         dprintk("RPC:       %s: returned error %d\n", __func__, err);
         return ERR_PTR(err);
 }
-
-/**
- * rpc_clone_client - Clone an RPC client structure
- *
- * @clnt: RPC client whose parameters are copied
- *
- * Returns a fresh RPC client or an ERR_PTR.
- */
-struct rpc_clnt *rpc_clone_client(struct rpc_clnt *clnt)
-{
-        struct rpc_create_args args = {
-                .program        = clnt->cl_program,
-                .prognumber     = clnt->cl_prog,
-                .version        = clnt->cl_vers,
-                .authflavor     = clnt->cl_auth->au_flavor,
-                .client_name    = clnt->cl_principal,
-        };
-        return __rpc_clone_client(&args, clnt);
-}
 EXPORT_SYMBOL_GPL(rpc_clone_client);
 
-/**
- * rpc_clone_client_set_auth - Clone an RPC client structure and set its auth
- *
- * @clnt: RPC client whose parameters are copied
- * @flavor: security flavor for new client
- *
- * Returns a fresh RPC client or an ERR_PTR.
- */
-struct rpc_clnt *
-rpc_clone_client_set_auth(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
-{
-        struct rpc_create_args args = {
-                .program        = clnt->cl_program,
-                .prognumber     = clnt->cl_prog,
-                .version        = clnt->cl_vers,
-                .authflavor     = flavor,
-                .client_name    = clnt->cl_principal,
-        };
-        return __rpc_clone_client(&args, clnt);
-}
-EXPORT_SYMBOL_GPL(rpc_clone_client_set_auth);
-
 /*
  * Kill all tasks for the given client.
  * XXX: kill their descendants as well?
@@ -610,11 +453,8 @@ EXPORT_SYMBOL_GPL(rpc_killall_tasks);
  */
 void rpc_shutdown_client(struct rpc_clnt *clnt)
 {
-        might_sleep();
-
-        dprintk_rcu("RPC:       shutting down %s client for %s\n",
-                        clnt->cl_protname,
-                        rcu_dereference(clnt->cl_xprt)->servername);
+        dprintk("RPC:       shutting down %s client for %s\n",
+                        clnt->cl_protname, clnt->cl_server);
 
         while (!list_empty(&clnt->cl_tasks)) {
                 rpc_killall_tasks(clnt);
@@ -632,17 +472,24 @@ EXPORT_SYMBOL_GPL(rpc_shutdown_client);
 static void
 rpc_free_client(struct rpc_clnt *clnt)
 {
-        dprintk_rcu("RPC:       destroying %s client for %s\n",
-                        clnt->cl_protname,
-                        rcu_dereference(clnt->cl_xprt)->servername);
-        if (clnt->cl_parent != clnt)
+        dprintk("RPC:       destroying %s client for %s\n",
+                        clnt->cl_protname, clnt->cl_server);
+        if (!IS_ERR(clnt->cl_path.dentry)) {
+                rpc_remove_client_dir(clnt->cl_path.dentry);
+                rpc_put_mount();
+        }
+        if (clnt->cl_parent != clnt) {
                 rpc_release_client(clnt->cl_parent);
+                goto out_free;
+        }
+        if (clnt->cl_server != clnt->cl_inline_name)
+                kfree(clnt->cl_server);
+out_free:
         rpc_unregister_client(clnt);
-        rpc_clnt_remove_pipedir(clnt);
         rpc_free_iostats(clnt->cl_metrics);
         kfree(clnt->cl_principal);
         clnt->cl_metrics = NULL;
-        xprt_put(rcu_dereference_raw(clnt->cl_xprt));
+        xprt_put(clnt->cl_xprt);
         rpciod_down();
         kfree(clnt);
 }
@@ -695,22 +542,24 @@ rpc_release_client(struct rpc_clnt *clnt)
  * The Sun NFSv2/v3 ACL protocol can do this.
  */
 struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *old,
-                                      const struct rpc_program *program,
+                                      struct rpc_program *program,
                                       u32 vers)
 {
-        struct rpc_create_args args = {
-                .program        = program,
-                .prognumber     = program->number,
-                .version        = vers,
-                .authflavor     = old->cl_auth->au_flavor,
-                .client_name    = old->cl_principal,
-        };
         struct rpc_clnt *clnt;
+        struct rpc_version *version;
         int err;
 
-        clnt = __rpc_clone_client(&args, old);
+        BUG_ON(vers >= program->nrvers || !program->version[vers]);
+        version = program->version[vers];
+        clnt = rpc_clone_client(old);
         if (IS_ERR(clnt))
                 goto out;
+        clnt->cl_procinfo = version->procs;
+        clnt->cl_maxproc  = version->nrprocs;
+        clnt->cl_protname = program->name;
+        clnt->cl_prog     = program->number;
+        clnt->cl_vers     = version->number;
+        clnt->cl_stats    = program->stats;
         err = rpc_ping(clnt);
         if (err != 0) {
                 rpc_shutdown_client(clnt);
@@ -745,15 +594,6 @@ void rpc_task_set_client(struct rpc_task *task, struct rpc_clnt *clnt)
                 atomic_inc(&clnt->cl_count);
                 if (clnt->cl_softrtry)
                         task->tk_flags |= RPC_TASK_SOFT;
-                if (sk_memalloc_socks()) {
-                        struct rpc_xprt *xprt;
-
-                        rcu_read_lock();
-                        xprt = rcu_dereference(clnt->cl_xprt);
-                        if (xprt->swapper)
-                                task->tk_flags |= RPC_TASK_SWAPPER;
-                        rcu_read_unlock();
-                }
                 /* Add to the client's list of all tasks */
                 spin_lock(&clnt->cl_lock);
                 list_add_tail(&task->tk_task, &clnt->cl_tasks);
@@ -835,12 +675,7 @@ int rpc_call_sync(struct rpc_clnt *clnt, const struct rpc_message *msg, int flag
         };
         int status;
 
-        WARN_ON_ONCE(flags & RPC_TASK_ASYNC);
-        if (flags & RPC_TASK_ASYNC) {
-                rpc_release_calldata(task_setup_data.callback_ops,
-                        task_setup_data.callback_data);
-                return -EINVAL;
-        }
+        BUG_ON(flags & RPC_TASK_ASYNC);
 
         task = rpc_run_task(&task_setup_data);
         if (IS_ERR(task))
@@ -916,7 +751,7 @@ struct rpc_task *rpc_run_bc_task(struct rpc_rqst *req,
 
         task->tk_action = call_bc_transmit;
         atomic_inc(&task->tk_count);
-        WARN_ON_ONCE(atomic_read(&task->tk_count) != 2);
+        BUG_ON(atomic_read(&task->tk_count) != 2);
         rpc_execute(task);
 
 out:
@@ -943,18 +778,13 @@ EXPORT_SYMBOL_GPL(rpc_call_start);
 size_t rpc_peeraddr(struct rpc_clnt *clnt, struct sockaddr *buf, size_t bufsize)
 {
         size_t bytes;
-        struct rpc_xprt *xprt;
+        struct rpc_xprt *xprt = clnt->cl_xprt;
 
-        rcu_read_lock();
-        xprt = rcu_dereference(clnt->cl_xprt);
-
-        bytes = xprt->addrlen;
+        bytes = sizeof(xprt->addr);
         if (bytes > bufsize)
                 bytes = bufsize;
-        memcpy(buf, &xprt->addr, bytes);
-        rcu_read_unlock();
-
-        return bytes;
+        memcpy(buf, &clnt->cl_xprt->addr, bytes);
+        return xprt->addrlen;
 }
 EXPORT_SYMBOL_GPL(rpc_peeraddr);
 
@@ -963,16 +793,11 @@ EXPORT_SYMBOL_GPL(rpc_peeraddr);
  * @clnt: RPC client structure
  * @format: address format
  *
- * NB: the lifetime of the memory referenced by the returned pointer is
- * the same as the rpc_xprt itself.  As long as the caller uses this
- * pointer, it must hold the RCU read lock.
  */
 const char *rpc_peeraddr2str(struct rpc_clnt *clnt,
                              enum rpc_display_format_t format)
 {
-        struct rpc_xprt *xprt;
-
-        xprt = rcu_dereference(clnt->cl_xprt);
+        struct rpc_xprt *xprt = clnt->cl_xprt;
 
         if (xprt->address_strings[format] != NULL)
                 return xprt->address_strings[format];
@@ -981,203 +806,17 @@ const char *rpc_peeraddr2str(struct rpc_clnt *clnt,
 }
 EXPORT_SYMBOL_GPL(rpc_peeraddr2str);
 
-static const struct sockaddr_in rpc_inaddr_loopback = {
-        .sin_family             = AF_INET,
-        .sin_addr.s_addr        = htonl(INADDR_ANY),
-};
-
-static const struct sockaddr_in6 rpc_in6addr_loopback = {
-        .sin6_family            = AF_INET6,
-        .sin6_addr              = IN6ADDR_ANY_INIT,
-};
-
-/*
- * Try a getsockname() on a connected datagram socket.  Using a
- * connected datagram socket prevents leaving a socket in TIME_WAIT.
- * This conserves the ephemeral port number space.
- *
- * Returns zero and fills in "buf" if successful; otherwise, a
- * negative errno is returned.
- */
-static int rpc_sockname(struct net *net, struct sockaddr *sap, size_t salen,
-                        struct sockaddr *buf, int buflen)
-{
-        struct socket *sock;
-        int err;
-
-        err = __sock_create(net, sap->sa_family,
-                                SOCK_DGRAM, IPPROTO_UDP, &sock, 1);
-        if (err < 0) {
-                dprintk("RPC:       can't create UDP socket (%d)\n", err);
-                goto out;
-        }
-
-        switch (sap->sa_family) {
-        case AF_INET:
-                err = kernel_bind(sock,
-                                (struct sockaddr *)&rpc_inaddr_loopback,
-                                sizeof(rpc_inaddr_loopback));
-                break;
-        case AF_INET6:
-                err = kernel_bind(sock,
-                                (struct sockaddr *)&rpc_in6addr_loopback,
-                                sizeof(rpc_in6addr_loopback));
-                break;
-        default:
-                err = -EAFNOSUPPORT;
-                goto out;
-        }
-        if (err < 0) {
-                dprintk("RPC:       can't bind UDP socket (%d)\n", err);
-                goto out_release;
-        }
-
-        err = kernel_connect(sock, sap, salen, 0);
-        if (err < 0) {
-                dprintk("RPC:       can't connect UDP socket (%d)\n", err);
-                goto out_release;
-        }
-
-        err = kernel_getsockname(sock, buf, &buflen);
-        if (err < 0) {
-                dprintk("RPC:       getsockname failed (%d)\n", err);
-                goto out_release;
-        }
-
-        err = 0;
-        if (buf->sa_family == AF_INET6) {
-                struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)buf;
-                sin6->sin6_scope_id = 0;
-        }
-        dprintk("RPC:       %s succeeded\n", __func__);
-
-out_release:
-        sock_release(sock);
-out:
-        return err;
-}
-
-/*
- * Scraping a connected socket failed, so we don't have a useable
- * local address.  Fallback: generate an address that will prevent
- * the server from calling us back.
- *
- * Returns zero and fills in "buf" if successful; otherwise, a
- * negative errno is returned.
- */
-static int rpc_anyaddr(int family, struct sockaddr *buf, size_t buflen)
-{
-        switch (family) {
-        case AF_INET:
-                if (buflen < sizeof(rpc_inaddr_loopback))
-                        return -EINVAL;
-                memcpy(buf, &rpc_inaddr_loopback,
-                                sizeof(rpc_inaddr_loopback));
-                break;
-        case AF_INET6:
-                if (buflen < sizeof(rpc_in6addr_loopback))
-                        return -EINVAL;
-                memcpy(buf, &rpc_in6addr_loopback,
-                                sizeof(rpc_in6addr_loopback));
-        default:
-                dprintk("RPC:       %s: address family not supported\n",
-                        __func__);
-                return -EAFNOSUPPORT;
-        }
-        dprintk("RPC:       %s: succeeded\n", __func__);
-        return 0;
-}
-
-/**
- * rpc_localaddr - discover local endpoint address for an RPC client
- * @clnt: RPC client structure
- * @buf: target buffer
- * @buflen: size of target buffer, in bytes
- *
- * Returns zero and fills in "buf" and "buflen" if successful;
- * otherwise, a negative errno is returned.
- *
- * This works even if the underlying transport is not currently connected,
- * or if the upper layer never previously provided a source address.
- *
- * The result of this function call is transient: multiple calls in
- * succession may give different results, depending on how local
- * networking configuration changes over time.
- */
-int rpc_localaddr(struct rpc_clnt *clnt, struct sockaddr *buf, size_t buflen)
-{
-        struct sockaddr_storage address;
-        struct sockaddr *sap = (struct sockaddr *)&address;
-        struct rpc_xprt *xprt;
-        struct net *net;
-        size_t salen;
-        int err;
-
-        rcu_read_lock();
-        xprt = rcu_dereference(clnt->cl_xprt);
-        salen = xprt->addrlen;
-        memcpy(sap, &xprt->addr, salen);
-        net = get_net(xprt->xprt_net);
-        rcu_read_unlock();
-
-        rpc_set_port(sap, 0);
-        err = rpc_sockname(net, sap, salen, buf, buflen);
-        put_net(net);
-        if (err != 0)
-                /* Couldn't discover local address, return ANYADDR */
-                return rpc_anyaddr(sap->sa_family, buf, buflen);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(rpc_localaddr);
-
 void
 rpc_setbufsize(struct rpc_clnt *clnt, unsigned int sndsize, unsigned int rcvsize)
 {
-        struct rpc_xprt *xprt;
-
-        rcu_read_lock();
-        xprt = rcu_dereference(clnt->cl_xprt);
+        struct rpc_xprt *xprt = clnt->cl_xprt;
         if (xprt->ops->set_buffer_size)
                 xprt->ops->set_buffer_size(xprt, sndsize, rcvsize);
-        rcu_read_unlock();
 }
 EXPORT_SYMBOL_GPL(rpc_setbufsize);
 
-/**
- * rpc_protocol - Get transport protocol number for an RPC client
- * @clnt: RPC client to query
- *
- */
-int rpc_protocol(struct rpc_clnt *clnt)
-{
-        int protocol;
-
-        rcu_read_lock();
-        protocol = rcu_dereference(clnt->cl_xprt)->prot;
-        rcu_read_unlock();
-        return protocol;
-}
-EXPORT_SYMBOL_GPL(rpc_protocol);
-
-/**
- * rpc_net_ns - Get the network namespace for this RPC client
- * @clnt: RPC client to query
- *
- */
-struct net *rpc_net_ns(struct rpc_clnt *clnt)
-{
-        struct net *ret;
-
-        rcu_read_lock();
-        ret = rcu_dereference(clnt->cl_xprt)->xprt_net;
-        rcu_read_unlock();
-        return ret;
-}
-EXPORT_SYMBOL_GPL(rpc_net_ns);
-
-/**
- * rpc_max_payload - Get maximum payload size for a transport, in bytes
- * @clnt: RPC client to query
+/*
+ * Return size of largest payload RPC client can support, in bytes
  *
  * For stream transports, this is one RPC record fragment (see RFC
  * 1831), as we don't support multi-record requests yet.  For datagram
@@ -1186,12 +825,7 @@ EXPORT_SYMBOL_GPL(rpc_net_ns);
  */
 size_t rpc_max_payload(struct rpc_clnt *clnt)
 {
-        size_t ret;
-
-        rcu_read_lock();
-        ret = rcu_dereference(clnt->cl_xprt)->max_payload;
-        rcu_read_unlock();
-        return ret;
+        return clnt->cl_xprt->max_payload;
 }
 EXPORT_SYMBOL_GPL(rpc_max_payload);
 
@@ -1202,11 +836,8 @@ EXPORT_SYMBOL_GPL(rpc_max_payload);
  */
 void rpc_force_rebind(struct rpc_clnt *clnt)
 {
-        if (clnt->cl_autobind) {
-                rcu_read_lock();
-                xprt_clear_bound(rcu_dereference(clnt->cl_xprt));
-                rcu_read_unlock();
-        }
+        if (clnt->cl_autobind)
+                xprt_clear_bound(clnt->cl_xprt);
 }
 EXPORT_SYMBOL_GPL(rpc_force_rebind);
 
@@ -1219,9 +850,7 @@ rpc_restart_call_prepare(struct rpc_task *task)
 {
         if (RPC_ASSASSINATED(task))
                 return 0;
-        task->tk_action = call_start;
-        if (task->tk_ops->rpc_call_prepare != NULL)
-                task->tk_action = rpc_prepare_task;
+        task->tk_action = rpc_prepare_task;
         return 1;
 }
 EXPORT_SYMBOL_GPL(rpc_restart_call_prepare);
@@ -1328,8 +957,6 @@ call_reserveresult(struct rpc_task *task)
         }
 
         switch (status) {
-        case -ENOMEM:
-                rpc_delay(task, HZ >> 2);
         case -EAGAIN:   /* woken up; retry */
                 task->tk_action = call_reserve;
                 return;
@@ -1376,7 +1003,6 @@ call_refreshresult(struct rpc_task *task)
                 return;
         case -ETIMEDOUT:
                 rpc_delay(task, 3*HZ);
-        case -EKEYEXPIRED:
         case -EAGAIN:
                 status = -EACCES;
                 if (!task->tk_cred_retry)
@@ -1535,7 +1161,6 @@ call_bind_status(struct rpc_task *task)
                 return;
         }
 
-        trace_rpc_bind_status(task);
         switch (task->tk_status) {
         case -ENOMEM:
                 dprintk("RPC: %5u rpcbind out of memory\n", task->tk_pid);
@@ -1635,7 +1260,6 @@ call_connect_status(struct rpc_task *task)
                 return;
         }
 
-        trace_rpc_connect_status(task, status);
         switch (status) {
                 /* if soft mounted, test if we've timed out */
         case -ETIMEDOUT:
@@ -1663,6 +1287,7 @@ call_transmit(struct rpc_task *task)
         task->tk_action = call_transmit_status;
         /* Encode here so that rpcsec_gss can use correct sequence number. */
         if (rpc_task_need_encode(task)) {
+                BUG_ON(task->tk_rqstp->rq_bytes_sent != 0);
                 rpc_xdr_encode(task);
                 /* Did the encode result in an error condition? */
                 if (task->tk_status != 0) {
@@ -1746,6 +1371,7 @@ call_bc_transmit(struct rpc_task *task)
 {
         struct rpc_rqst *req = task->tk_rqstp;
 
+        BUG_ON(task->tk_status != 0);
         task->tk_status = xprt_prepare_transmit(task);
         if (task->tk_status == -EAGAIN) {
                 /*
@@ -1792,7 +1418,7 @@ call_bc_transmit(struct rpc_task *task)
                  * We were unable to reply and will have to drop the
                  * request.  The server should reconnect and retransmit.
                  */
-                WARN_ON_ONCE(task->tk_status == -EAGAIN);
+                BUG_ON(task->tk_status == -EAGAIN);
                 printk(KERN_NOTICE "RPC: Could not send backchannel reply "
                         "error: %d\n", task->tk_status);
                 break;
@@ -1822,7 +1448,6 @@ call_status(struct rpc_task *task)
                 return;
         }
 
-        trace_rpc_call_status(task);
         task->tk_status = 0;
         switch(status) {
         case -EHOSTDOWN:
@@ -1885,13 +1510,9 @@ call_timeout(struct rpc_task *task)
                 return;
         }
         if (RPC_IS_SOFT(task)) {
-                if (clnt->cl_chatty) {
-                        rcu_read_lock();
+                if (clnt->cl_chatty)
                         printk(KERN_NOTICE "%s: server %s not responding, timed out\n",
-                                clnt->cl_protname,
-                                rcu_dereference(clnt->cl_xprt)->servername);
-                        rcu_read_unlock();
-                }
+                                clnt->cl_protname, clnt->cl_server);
                 if (task->tk_flags & RPC_TASK_TIMEOUT)
                         rpc_exit(task, -ETIMEDOUT);
                 else
@@ -1901,13 +1522,9 @@ call_timeout(struct rpc_task *task)
 
         if (!(task->tk_flags & RPC_CALL_MAJORSEEN)) {
                 task->tk_flags |= RPC_CALL_MAJORSEEN;
-                if (clnt->cl_chatty) {
-                        rcu_read_lock();
+                if (clnt->cl_chatty)
                         printk(KERN_NOTICE "%s: server %s not responding, still trying\n",
-                        clnt->cl_protname,
-                        rcu_dereference(clnt->cl_xprt)->servername);
-                        rcu_read_unlock();
-                }
+                        clnt->cl_protname, clnt->cl_server);
         }
         rpc_force_rebind(clnt);
         /*
@@ -1936,13 +1553,9 @@ call_decode(struct rpc_task *task)
         dprint_status(task);
 
         if (task->tk_flags & RPC_CALL_MAJORSEEN) {
-                if (clnt->cl_chatty) {
-                        rcu_read_lock();
+                if (clnt->cl_chatty)
                         printk(KERN_NOTICE "%s: server %s OK\n",
-                                clnt->cl_protname,
-                                rcu_dereference(clnt->cl_xprt)->servername);
-                        rcu_read_unlock();
-                }
+                                clnt->cl_protname, clnt->cl_server);
                 task->tk_flags &= ~RPC_CALL_MAJORSEEN;
         }
 
@@ -2020,7 +1633,6 @@ rpc_encode_header(struct rpc_task *task)
 static __be32 *
 rpc_verify_header(struct rpc_task *task)
 {
-        struct rpc_clnt *clnt = task->tk_client;
         struct kvec *iov = &task->tk_rqstp->rq_rcv_buf.head[0];
         int len = task->tk_rqstp->rq_rcv_buf.len >> 2;
         __be32  *p = iov->iov_base;
@@ -2093,11 +1705,8 @@ rpc_verify_header(struct rpc_task *task)
                         task->tk_action = call_bind;
                         goto out_retry;
                 case RPC_AUTH_TOOWEAK:
-                        rcu_read_lock();
                         printk(KERN_NOTICE "RPC: server %s requires stronger "
-                               "authentication.\n",
-                               rcu_dereference(clnt->cl_xprt)->servername);
-                        rcu_read_unlock();
+                               "authentication.\n", task->tk_client->cl_server);
                         break;
                 default:
                         dprintk("RPC: %5u %s: unknown auth error: %x\n",
@@ -2120,27 +1729,28 @@ rpc_verify_header(struct rpc_task *task)
         case RPC_SUCCESS:
                 return p;
         case RPC_PROG_UNAVAIL:
-                dprintk_rcu("RPC: %5u %s: program %u is unsupported "
-                                "by server %s\n", task->tk_pid, __func__,
-                                (unsigned int)clnt->cl_prog,
-                                rcu_dereference(clnt->cl_xprt)->servername);
+                dprintk("RPC: %5u %s: program %u is unsupported by server %s\n",
+                                task->tk_pid, __func__,
+                                (unsigned int)task->tk_client->cl_prog,
+                                task->tk_client->cl_server);
                 error = -EPFNOSUPPORT;
                 goto out_err;
         case RPC_PROG_MISMATCH:
-                dprintk_rcu("RPC: %5u %s: program %u, version %u unsupported "
-                                "by server %s\n", task->tk_pid, __func__,
-                                (unsigned int)clnt->cl_prog,
-                                (unsigned int)clnt->cl_vers,
-                                rcu_dereference(clnt->cl_xprt)->servername);
+                dprintk("RPC: %5u %s: program %u, version %u unsupported by "
+                                "server %s\n", task->tk_pid, __func__,
+                                (unsigned int)task->tk_client->cl_prog,
+                                (unsigned int)task->tk_client->cl_vers,
+                                task->tk_client->cl_server);
                 error = -EPROTONOSUPPORT;
                 goto out_err;
         case RPC_PROC_UNAVAIL:
-                dprintk_rcu("RPC: %5u %s: proc %s unsupported by program %u, "
+                dprintk("RPC: %5u %s: proc %s unsupported by program %u, "
                                 "version %u on server %s\n",
                                 task->tk_pid, __func__,
                                 rpc_proc_name(task),
-                                clnt->cl_prog, clnt->cl_vers,
-                                rcu_dereference(clnt->cl_xprt)->servername);
+                                task->tk_client->cl_prog,
+                                task->tk_client->cl_vers,
+                                task->tk_client->cl_server);
                 error = -EOPNOTSUPP;
                 goto out_err;
         case RPC_GARBAGE_ARGS:
@@ -2154,7 +1764,7 @@ rpc_verify_header(struct rpc_task *task)
         }
 
 out_garbage:
-        clnt->cl_stats->rpcgarbage++;
+        task->tk_client->cl_stats->rpcgarbage++;
         if (task->tk_garb_retry) {
                 task->tk_garb_retry--;
                 dprintk("RPC: %5u %s: retrying\n",
@@ -2240,15 +1850,14 @@ static void rpc_show_task(const struct rpc_clnt *clnt,
                 task->tk_action, rpc_waitq);
 }
 
-void rpc_show_tasks(struct net *net)
+void rpc_show_tasks(void)
 {
         struct rpc_clnt *clnt;
         struct rpc_task *task;
         int header = 0;
-        struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
 
-        spin_lock(&sn->rpc_client_lock);
-        list_for_each_entry(clnt, &sn->all_clients, cl_clients) {
+        spin_lock(&rpc_client_lock);
+        list_for_each_entry(clnt, &all_clients, cl_clients) {
                 spin_lock(&clnt->cl_lock);
                 list_for_each_entry(task, &clnt->cl_tasks, tk_task) {
                         if (!header) {
@@ -2259,6 +1868,6 @@ void rpc_show_tasks(struct net *net)
                 }
                 spin_unlock(&clnt->cl_lock);
         }
-        spin_unlock(&sn->rpc_client_lock);
+        spin_unlock(&rpc_client_lock);
 }
 #endif