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

* git://git.linux-nfs.org/pub/linux/nfs-2.6: (122 commits)
  sunrpc: drop BKL around wrap and unwrap
  NFSv4: Make sure unlock is really an unlock when cancelling a lock
  NLM: fix source address of callback to client
  SUNRPC client: add interface for binding to a local address
  SUNRPC server: record the destination address of a request
  SUNRPC: cleanup transport creation argument passing
  NFSv4: Make the NFS state model work with the nosharedcache mount option
  NFS: Error when mounting the same filesystem with different options
  NFS: Add the mount option "nosharecache"
  NFS: Add support for mounting NFSv4 file systems with string options
  NFS: Add final pieces to support in-kernel mount option parsing
  NFS: Introduce generic mount client API
  NFS: Add enums and match tables for mount option parsing
  NFS: Improve debugging output in NFS in-kernel mount client
  NFS: Clean up in-kernel NFS mount
  NFS: Remake nfsroot_mount as a permanent part of NFS client
  SUNRPC: Add a convenient default for the hostname when calling rpc_create()
  SUNRPC: Rename rpcb_getport to be consistent with new rpcb_getport_sync name
  SUNRPC: Rename rpcb_getport_external routine
  SUNRPC: Allow rpcbind requests to be interrupted by a signal.
  ...

3 files changed, 23 insertions, 24 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 96070bff93fc..572601e98dcd 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -44,9 +44,8 @@ static struct nsm_handle *	nsm_find(const struct sockaddr_in *sin,
  */
 static struct nlm_host *
 nlm_lookup_host(int server, const struct sockaddr_in *sin,
-                                        int proto, int version,
-                                        const char *hostname,
-                                        int hostname_len)
+                int proto, int version, const char *hostname,
+                int hostname_len, const struct sockaddr_in *ssin)
 {
         struct hlist_head *chain;
         struct hlist_node *pos;
@@ -54,7 +53,9 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin,
         struct nsm_handle *nsm = NULL;
         int             hash;
 
-        dprintk("lockd: nlm_lookup_host(%u.%u.%u.%u, p=%d, v=%d, my role=%s, name=%.*s)\n",
+        dprintk("lockd: nlm_lookup_host("NIPQUAD_FMT"->"NIPQUAD_FMT
+                        ", p=%d, v=%d, my role=%s, name=%.*s)\n",
+                        NIPQUAD(ssin->sin_addr.s_addr),
                         NIPQUAD(sin->sin_addr.s_addr), proto, version,
                         server? "server" : "client",
                         hostname_len,
@@ -91,6 +92,8 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin,
                         continue;
                 if (host->h_server != server)
                         continue;
+                if (!nlm_cmp_addr(&host->h_saddr, ssin))
+                        continue;
 
                 /* Move to head of hash chain. */
                 hlist_del(&host->h_hash);
@@ -118,6 +121,7 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin,
         host->h_name       = nsm->sm_name;
         host->h_addr       = *sin;
         host->h_addr.sin_port = 0;      /* ouch! */
+        host->h_saddr      = *ssin;
         host->h_version    = version;
         host->h_proto      = proto;
         host->h_rpcclnt    = NULL;
@@ -161,15 +165,9 @@ nlm_destroy_host(struct nlm_host *host)
          */
         nsm_unmonitor(host);
 
-        if ((clnt = host->h_rpcclnt) != NULL) {
-                if (atomic_read(&clnt->cl_users)) {
-                        printk(KERN_WARNING
-                                "lockd: active RPC handle\n");
-                        clnt->cl_dead = 1;
-                } else {
-                        rpc_destroy_client(host->h_rpcclnt);
-                }
-        }
+        clnt = host->h_rpcclnt;
+        if (clnt != NULL)
+                rpc_shutdown_client(clnt);
         kfree(host);
 }
 
@@ -180,8 +178,10 @@ struct nlm_host *
 nlmclnt_lookup_host(const struct sockaddr_in *sin, int proto, int version,
                         const char *hostname, int hostname_len)
 {
+        struct sockaddr_in ssin = {0};
+
         return nlm_lookup_host(0, sin, proto, version,
-                               hostname, hostname_len);
+                               hostname, hostname_len, &ssin);
 }
 
 /*
@@ -191,9 +191,12 @@ struct nlm_host *
 nlmsvc_lookup_host(struct svc_rqst *rqstp,
                         const char *hostname, int hostname_len)
 {
+        struct sockaddr_in ssin = {0};
+
+        ssin.sin_addr = rqstp->rq_daddr.addr;
         return nlm_lookup_host(1, svc_addr_in(rqstp),
                                rqstp->rq_prot, rqstp->rq_vers,
-                               hostname, hostname_len);
+                               hostname, hostname_len, &ssin);
 }
 
 /*
@@ -204,8 +207,9 @@ nlm_bind_host(struct nlm_host *host)
 {
         struct rpc_clnt *clnt;
 
-        dprintk("lockd: nlm_bind_host(%08x)\n",
-                        (unsigned)ntohl(host->h_addr.sin_addr.s_addr));
+        dprintk("lockd: nlm_bind_host("NIPQUAD_FMT"->"NIPQUAD_FMT")\n",
+                        NIPQUAD(host->h_saddr.sin_addr),
+                        NIPQUAD(host->h_addr.sin_addr));
 
         /* Lock host handle */
         mutex_lock(&host->h_mutex);
@@ -232,6 +236,7 @@ nlm_bind_host(struct nlm_host *host)
                         .protocol       = host->h_proto,
                         .address        = (struct sockaddr *)&host->h_addr,
                         .addrsize       = sizeof(host->h_addr),
+                        .saddress       = (struct sockaddr *)&host->h_saddr,
                         .timeout        = &timeparms,
                         .servername     = host->h_name,
                         .program        = &nlm_program,
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 2102e2d0134d..3353ed8421a7 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -61,6 +61,7 @@ nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
                         status);
         else
                 status = 0;
+        rpc_shutdown_client(clnt);
  out:
         return status;
 }
@@ -138,7 +139,6 @@ nsm_create(void)
                 .program        = &nsm_program,
                 .version        = SM_VERSION,
                 .authflavor     = RPC_AUTH_NULL,
-                .flags          = (RPC_CLNT_CREATE_ONESHOT),
         };
 
         return rpc_create(&args);
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 126b1bf02c0e..26809325469c 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -123,9 +123,6 @@ lockd(struct svc_rqst *rqstp)
         /* Process request with signals blocked, but allow SIGKILL.  */
         allow_signal(SIGKILL);
 
-        /* kick rpciod */
-        rpciod_up();
-
         dprintk("NFS locking service started (ver " LOCKD_VERSION ").\n");
 
         if (!nlm_timeout)
@@ -202,9 +199,6 @@ lockd(struct svc_rqst *rqstp)
         /* Exit the RPC thread */
         svc_exit_thread(rqstp);
 
-        /* release rpciod */
-        rpciod_down();
-
         /* Release module */
         unlock_kernel();
         module_put_and_exit(0);