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, 9 insertions, 3 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 82f7a0b1d8ae..112ebf8b8dfe 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -123,6 +123,8 @@ nlm_lookup_host(int server, struct sockaddr_in *sin,
         nlm_hosts[hash]    = host;
         INIT_LIST_HEAD(&host->h_lockowners);
         spin_lock_init(&host->h_lock);
+        INIT_LIST_HEAD(&host->h_granted);
+        INIT_LIST_HEAD(&host->h_reclaim);
 
         if (++nrhosts > NLM_HOST_MAX)
                 next_gc = 0;
@@ -191,11 +193,12 @@ nlm_bind_host(struct nlm_host *host)
                 xprt->resvport = 1;     /* NLM requires a reserved port */
 
                 /* Existing NLM servers accept AUTH_UNIX only */
-                clnt = rpc_create_client(xprt, host->h_name, &nlm_program,
+                clnt = rpc_new_client(xprt, host->h_name, &nlm_program,
                                         host->h_version, RPC_AUTH_UNIX);
                 if (IS_ERR(clnt))
                         goto forgetit;
                 clnt->cl_autobind = 1;  /* turn on pmap queries */
+                clnt->cl_softrtry = 1; /* All queries are soft */
 
                 host->h_rpcclnt = clnt;
         }
@@ -242,8 +245,12 @@ void nlm_release_host(struct nlm_host *host)
 {
         if (host != NULL) {
                 dprintk("lockd: release host %s\n", host->h_name);
-                atomic_dec(&host->h_count);
                 BUG_ON(atomic_read(&host->h_count) < 0);
+                if (atomic_dec_and_test(&host->h_count)) {
+                        BUG_ON(!list_empty(&host->h_lockowners));
+                        BUG_ON(!list_empty(&host->h_granted));
+                        BUG_ON(!list_empty(&host->h_reclaim));
+                }
         }
 }
 
@@ -331,7 +338,6 @@ nlm_gc_hosts(void)
                                         rpc_destroy_client(host->h_rpcclnt);
                                 }
                         }
-                        BUG_ON(!list_empty(&host->h_lockowners));
                         kfree(host);
                         nrhosts--;
                 }