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, 12 insertions, 4 deletions

diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c
index 6a5bbc0ae941..33287879bd23 100644
--- a/fs/nfs/nfs3acl.c
+++ b/fs/nfs/nfs3acl.c
@@ -190,6 +190,10 @@ struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type)
         struct nfs3_getaclres res = {
                 .fattr =        &fattr,
         };
+        struct rpc_message msg = {
+                .rpc_argp       = &args,
+                .rpc_resp       = &res,
+        };
         struct posix_acl *acl;
         int status, count;
 
@@ -218,8 +222,8 @@ struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type)
                 return NULL;
 
         dprintk("NFS call getacl\n");
-        status = rpc_call(server->client_acl, ACLPROC3_GETACL,
-                          &args, &res, 0);
+        msg.rpc_proc = &server->client_acl->cl_procinfo[ACLPROC3_GETACL];
+        status = rpc_call_sync(server->client_acl, &msg, 0);
         dprintk("NFS reply getacl: %d\n", status);
 
         /* pages may have been allocated at the xdr layer. */
@@ -286,6 +290,10 @@ static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,
                 .acl_access = acl,
                 .pages = pages,
         };
+        struct rpc_message msg = {
+                .rpc_argp       = &args,
+                .rpc_resp       = &fattr,
+        };
         int status, count;
 
         status = -EOPNOTSUPP;
@@ -306,8 +314,8 @@ static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,
 
         dprintk("NFS call setacl\n");
         nfs_begin_data_update(inode);
-        status = rpc_call(server->client_acl, ACLPROC3_SETACL,
-                          &args, &fattr, 0);
+        msg.rpc_proc = &server->client_acl->cl_procinfo[ACLPROC3_SETACL];
+        status = rpc_call_sync(server->client_acl, &msg, 0);
         spin_lock(&inode->i_lock);
         NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS;
         spin_unlock(&inode->i_lock);