OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] knfsd: misc minor fixes, indentation changes 

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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Olaf Kirch 2006-10-04 02:15:54 -07:00 committed by Linus Torvalds
parent 8dead0dbd4
commit f0737a39a6
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/lockd/host.c
View File

@ -110,16 +110,13 @@ nlm_lookup_host(int server, const struct sockaddr_in *sin,
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

8
fs/lockd/svcsubs.c
View File

@ -115,7 +115,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,
* 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_host *host)
{
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();
}
}
/*