Messages in this thread Patches in this message | | | From | NeilBrown <> | Date | Fri, 1 Sep 2006 14:38:32 +1000 | Subject | [PATCH 005 of 19] knfsd: Misc minor fixes, indentation changes |
| |
From: Olaf Kirch <okir@suse.de>
This cleans up some code in lockd/host.c, fixes an error printk and makes it a fatal BUG if nlmsvc_free_host_resources fails.
Signed-off-by: Olaf Kirch <okir@suse.de> Signed-off-by: Neil Brown <neilb@suse.de>
### Diffstat output ./fs/lockd/host.c | 15 ++++++--------- ./fs/lockd/svcsubs.c | 8 +++++--- 2 files changed, 11 insertions(+), 12 deletions(-)
diff .prev/fs/lockd/host.c ./fs/lockd/host.c --- .prev/fs/lockd/host.c 2006-08-31 17:00:03.000000000 +1000 +++ ./fs/lockd/host.c 2006-08-31 17:01:00.000000000 +1000 @@ -110,16 +110,13 @@ nlm_lookup_host(int server, const struct if (host->h_server != server) continue; - { - if (hp != nlm_hosts + hash) { - *hp = host->h_next; - host->h_next = nlm_hosts[hash]; - nlm_hosts[hash] = host; - } - nlm_get_host(host); - mutex_unlock(&nlm_host_mutex); - return host; + if (hp != nlm_hosts + hash) { + *hp = host->h_next; + host->h_next = nlm_hosts[hash]; + nlm_hosts[hash] = host; } + nlm_get_host(host); + goto out; } /* Sadly, the host isn't in our hash table yet. See if diff .prev/fs/lockd/svcsubs.c ./fs/lockd/svcsubs.c --- .prev/fs/lockd/svcsubs.c 2006-08-31 17:01:00.000000000 +1000 +++ ./fs/lockd/svcsubs.c 2006-08-31 17:01:00.000000000 +1000 @@ -115,7 +115,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, * the file. */ if ((nfserr = nlmsvc_ops->fopen(rqstp, f, &file->f_file)) != 0) { - dprintk("lockd: open failed (nfserr %d)\n", ntohl(nfserr)); + dprintk("lockd: open failed (error %d)\n", nfserr); goto out_free; } @@ -313,10 +313,12 @@ nlmsvc_free_host_resources(struct nlm_ho { dprintk("lockd: nlmsvc_free_host_resources\n"); - if (nlm_traverse_files(host, NLM_ACT_UNLOCK)) + if (nlm_traverse_files(host, NLM_ACT_UNLOCK)) { printk(KERN_WARNING - "lockd: couldn't remove all locks held by %s", + "lockd: couldn't remove all locks held by %s\n", host->h_name); + BUG(); + } } /* - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |