lockd: Fix Oopses due to list manipulation errors.

The patch "stop abusing file_lock_list introduces a couple of bugs since
the locks may be copied and need to be removed from the lists when they are
destroyed.

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

1 files changed, 5 insertions, 2 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index f456f8ed9ac..112ebf8b8df 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -245,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));
+                }
         }
 }
 
@@ -334,7 +338,6 @@ nlm_gc_hosts(void)
                                         rpc_destroy_client(host->h_rpcclnt);
                                 }
                         }
-                        BUG_ON(!list_empty(&host->h_lockowners));
                         kfree(host);
                         nrhosts--;
                 }