The patch titled
knfsd: misc minor fixes, indentation changes
has been removed from the -mm tree. Its filename is
knfsd-misc-minor-fixes-indentation-changes.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: knfsd: misc minor fixes, indentation changes
From: Olaf Kirch <okir@xxxxxxx>
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@xxxxxxx>
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/lockd/host.c | 15 ++++++---------
fs/lockd/svcsubs.c | 8 +++++---
2 files changed, 11 insertions(+), 12 deletions(-)
diff -puN fs/lockd/host.c~knfsd-misc-minor-fixes-indentation-changes fs/lockd/host.c
--- a/fs/lockd/host.c~knfsd-misc-minor-fixes-indentation-changes
+++ a/fs/lockd/host.c
@@ -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 -puN fs/lockd/svcsubs.c~knfsd-misc-minor-fixes-indentation-changes fs/lockd/svcsubs.c
--- a/fs/lockd/svcsubs.c~knfsd-misc-minor-fixes-indentation-changes
+++ a/fs/lockd/svcsubs.c
@@ -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();
+ }
}
/*
_
Patches currently in -mm which might be from okir@xxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
