Commit a2d30a54 authored by Trond Myklebust's avatar Trond Myklebust

lockd: Remove BUG_ON()s in fs/lockd/host.c

- Convert the non-trivial ones into WARN_ON_ONCE().
- Remove the trivial refcounting BUGs
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 326ce0a6
...@@ -177,9 +177,6 @@ static void nlm_destroy_host_locked(struct nlm_host *host) ...@@ -177,9 +177,6 @@ static void nlm_destroy_host_locked(struct nlm_host *host)
dprintk("lockd: destroy host %s\n", host->h_name); dprintk("lockd: destroy host %s\n", host->h_name);
BUG_ON(!list_empty(&host->h_lockowners));
BUG_ON(atomic_read(&host->h_count));
hlist_del_init(&host->h_hash); hlist_del_init(&host->h_hash);
nsm_unmonitor(host); nsm_unmonitor(host);
...@@ -289,13 +286,12 @@ void nlmclnt_release_host(struct nlm_host *host) ...@@ -289,13 +286,12 @@ void nlmclnt_release_host(struct nlm_host *host)
dprintk("lockd: release client host %s\n", host->h_name); dprintk("lockd: release client host %s\n", host->h_name);
BUG_ON(atomic_read(&host->h_count) < 0); WARN_ON_ONCE(host->h_server);
BUG_ON(host->h_server);
if (atomic_dec_and_test(&host->h_count)) { if (atomic_dec_and_test(&host->h_count)) {
BUG_ON(!list_empty(&host->h_lockowners)); WARN_ON_ONCE(!list_empty(&host->h_lockowners));
BUG_ON(!list_empty(&host->h_granted)); WARN_ON_ONCE(!list_empty(&host->h_granted));
BUG_ON(!list_empty(&host->h_reclaim)); WARN_ON_ONCE(!list_empty(&host->h_reclaim));
mutex_lock(&nlm_host_mutex); mutex_lock(&nlm_host_mutex);
nlm_destroy_host_locked(host); nlm_destroy_host_locked(host);
...@@ -412,8 +408,7 @@ void nlmsvc_release_host(struct nlm_host *host) ...@@ -412,8 +408,7 @@ void nlmsvc_release_host(struct nlm_host *host)
dprintk("lockd: release server host %s\n", host->h_name); dprintk("lockd: release server host %s\n", host->h_name);
BUG_ON(atomic_read(&host->h_count) < 0); WARN_ON_ONCE(!host->h_server);
BUG_ON(!host->h_server);
atomic_dec(&host->h_count); atomic_dec(&host->h_count);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment