Misc minor fixes, indentation changes
Subsystems (2)
PATCH 6/22 Misc minor fixes, indentation changes
From: Olaf Kirch <[email protected]>
Subject: Misc minor fixes, indentation changes
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 <[email protected]>
fs/lockd/host.c | 15 ++++++--------- fs/lockd/svcsubs.c | 8 +++++--- 2 files changed, 11 insertions(+), 12 deletions(-)
fs/lockd/host.c +6 -9
@@ -110,16 +110,13 @@ nlm_lookup_host(int server, const structif (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
fs/lockd/svcsubs.c +5 -3
@@ -116,7 +116,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; }
@@ -311,10 +311,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 (); + } }/*
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs