Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6: (103 commits)
  SUNRPC,RPCSEC_GSS: spkm3--fix config dependencies
  SUNRPC,RPCSEC_GSS: spkm3: import contexts using NID_cast5_cbc
  LOCKD: Make nlmsvc_traverse_shares return void
  LOCKD: nlmsvc_traverse_blocks return is unused
  SUNRPC,RPCSEC_GSS: fix krb5 sequence numbers.
  NFSv4: Dont list system.nfs4_acl for filesystems that don't support it.
  SUNRPC,RPCSEC_GSS: remove unnecessary kmalloc of a checksum
  SUNRPC: Ensure rpc_call_async() always calls tk_ops->rpc_release()
  SUNRPC: Fix memory barriers for req->rq_received
  NFS: Fix a race in nfs_sync_inode()
  NFS: Clean up nfs_flush_list()
  NFS: Fix a race with PG_private and nfs_release_page()
  NFSv4: Ensure the callback daemon flushes signals
  SUNRPC: Fix a 'Busy inodes' error in rpc_pipefs
  NFS, NLM: Allow blocking locks to respect signals
  NFS: Make nfs_fhget() return appropriate error values
  NFSv4: Fix an oops in nfs4_fill_super
  lockd: blocks should hold a reference to the nlm_file
  NFSv4: SETCLIENTID_CONFIRM should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE
  NFSv4: Send the delegation stateid for SETATTR calls
  ...

1 files changed, 29 insertions, 12 deletions

diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c
index 8139ce68e915..d25b054ec921 100644
--- a/net/sunrpc/pmap_clnt.c
+++ b/net/sunrpc/pmap_clnt.c
@@ -82,6 +82,7 @@ rpc_getport(struct rpc_task *task, struct rpc_clnt *clnt)
         rpc_call_setup(child, &msg, 0);
 
         /* ... and run the child task */
+        task->tk_xprt->stat.bind_count++;
         rpc_run_child(task, child, pmap_getport_done);
         return;
 
@@ -103,6 +104,11 @@ rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int prot)
                 .pm_prot        = prot,
                 .pm_port        = 0
         };
+        struct rpc_message msg = {
+                .rpc_proc       = &pmap_procedures[PMAP_GETPORT],
+                .rpc_argp       = &map,
+                .rpc_resp       = &map.pm_port,
+        };
         struct rpc_clnt *pmap_clnt;
         char            hostname[32];
         int             status;
@@ -116,7 +122,7 @@ rpc_getport_external(struct sockaddr_in *sin, __u32 prog, __u32 vers, int prot)
                 return PTR_ERR(pmap_clnt);
 
         /* Setup the call info struct */
-        status = rpc_call(pmap_clnt, PMAP_GETPORT, &map, &map.pm_port, 0);
+        status = rpc_call_sync(pmap_clnt, &msg, 0);
 
         if (status >= 0) {
                 if (map.pm_port != 0)
@@ -161,16 +167,27 @@ pmap_getport_done(struct rpc_task *task)
 int
 rpc_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay)
 {
-        struct sockaddr_in      sin;
-        struct rpc_portmap      map;
+        struct sockaddr_in      sin = {
+                .sin_family     = AF_INET,
+                .sin_addr.s_addr = htonl(INADDR_LOOPBACK),
+        };
+        struct rpc_portmap      map = {
+                .pm_prog        = prog,
+                .pm_vers        = vers,
+                .pm_prot        = prot,
+                .pm_port        = port,
+        };
+        struct rpc_message msg = {
+                .rpc_proc       = &pmap_procedures[port ? PMAP_SET : PMAP_UNSET],
+                .rpc_argp       = &map,
+                .rpc_resp       = okay,
+        };
         struct rpc_clnt         *pmap_clnt;
         int error = 0;
 
         dprintk("RPC: registering (%d, %d, %d, %d) with portmapper.\n",
                         prog, vers, prot, port);
 
-        sin.sin_family = AF_INET;
-        sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
         pmap_clnt = pmap_create("localhost", &sin, IPPROTO_UDP, 1);
         if (IS_ERR(pmap_clnt)) {
                 error = PTR_ERR(pmap_clnt);
@@ -178,13 +195,7 @@ rpc_register(u32 prog, u32 vers, int prot, unsigned short port, int *okay)
                 return error;
         }
 
-        map.pm_prog = prog;
-        map.pm_vers = vers;
-        map.pm_prot = prot;
-        map.pm_port = port;
-
-        error = rpc_call(pmap_clnt, port? PMAP_SET : PMAP_UNSET,
-                                        &map, okay, 0);
+        error = rpc_call_sync(pmap_clnt, &msg, 0);
 
         if (error < 0) {
                 printk(KERN_WARNING
@@ -260,6 +271,8 @@ static struct rpc_procinfo	pmap_procedures[] = {
           .p_decode             = (kxdrproc_t) xdr_decode_bool,
           .p_bufsiz             = 4,
           .p_count              = 1,
+          .p_statidx            = PMAP_SET,
+          .p_name               = "SET",
         },
 [PMAP_UNSET] = {
           .p_proc               = PMAP_UNSET,
@@ -267,6 +280,8 @@ static struct rpc_procinfo	pmap_procedures[] = {
           .p_decode             = (kxdrproc_t) xdr_decode_bool,
           .p_bufsiz             = 4,
           .p_count              = 1,
+          .p_statidx            = PMAP_UNSET,
+          .p_name               = "UNSET",
         },
 [PMAP_GETPORT] = {
           .p_proc               = PMAP_GETPORT,
@@ -274,6 +289,8 @@ static struct rpc_procinfo	pmap_procedures[] = {
           .p_decode             = (kxdrproc_t) xdr_decode_port,
           .p_bufsiz             = 4,
           .p_count              = 1,
+          .p_statidx            = PMAP_GETPORT,
+          .p_name               = "GETPORT",
         },
 };