SUNRPC: eliminate rpc_call()

Clean-up: replace rpc_call() helper with direct call to rpc_call_sync.

This makes NFSv2 and NFSv3 synchronous calls more computationally
efficient, and reduces stack consumption in functions that used to
invoke rpc_call more than once.

Test plan:
Compile kernel with CONFIG_NFS enabled.  Connectathon on NFS version 2,
version 3, and version 4 mount points.

Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 84ee39e6a3a2..5dd52b70859a 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -35,6 +35,10 @@ nsm_mon_unmon(struct nlm_host *host, u32 proc, struct nsm_res *res)
         struct rpc_clnt *clnt;
         int             status;
         struct nsm_args args;
+        struct rpc_message msg = {
+                .rpc_argp       = &args,
+                .rpc_resp       = res,
+        };
 
         clnt = nsm_create();
         if (IS_ERR(clnt)) {
@@ -49,7 +53,8 @@ nsm_mon_unmon(struct nlm_host *host, u32 proc, struct nsm_res *res)
         args.proc = NLMPROC_NSM_NOTIFY;
         memset(res, 0, sizeof(*res));
 
-        status = rpc_call(clnt, proc, &args, res, 0);
+        msg.rpc_proc = &clnt->cl_procinfo[proc];
+        status = rpc_call_sync(clnt, &msg, 0);
         if (status < 0)
                 printk(KERN_DEBUG "nsm_mon_unmon: rpc failed, status=%d\n",
                         status);