The patch titled
knfsd: hide use of lockd's h_monitored flag
has been removed from the -mm tree. Its filename is
knfsd-hide-use-of-lockds-h_monitored-flag.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: knfsd: hide use of lockd's h_monitored flag
From: Olaf Kirch <okir@xxxxxxx>
This patch moves all checks of the h_monitored flag into the
nsm_monitor/unmonitor functions. A subsequent patch will replace the
mechanism by which we mark a host as being monitored.
There is still one occurence of h_monitored outside of mon.c and that is in
clntlock.c where we respond to a reboot. The subsequent patch will modify
this too.
Signed-off-by: Olaf Kirch <okir@xxxxxxx>
Signed-off-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/lockd/clntproc.c | 2 +-
fs/lockd/host.c | 9 ++++++---
fs/lockd/mon.c | 19 ++++++++++++-------
fs/lockd/svc4proc.c | 2 +-
fs/lockd/svcproc.c | 2 +-
5 files changed, 21 insertions(+), 13 deletions(-)
diff -puN fs/lockd/clntproc.c~knfsd-hide-use-of-lockds-h_monitored-flag fs/lockd/clntproc.c
--- a/fs/lockd/clntproc.c~knfsd-hide-use-of-lockds-h_monitored-flag
+++ a/fs/lockd/clntproc.c
@@ -499,7 +499,7 @@ nlmclnt_lock(struct nlm_rqst *req, struc
unsigned char fl_flags = fl->fl_flags;
int status = -ENOLCK;
- if (!host->h_monitored && nsm_monitor(host) < 0) {
+ if (nsm_monitor(host) < 0) {
printk(KERN_NOTICE "lockd: failed to monitor %s\n",
host->h_name);
goto out;
diff -puN fs/lockd/host.c~knfsd-hide-use-of-lockds-h_monitored-flag fs/lockd/host.c
--- a/fs/lockd/host.c~knfsd-hide-use-of-lockds-h_monitored-flag
+++ a/fs/lockd/host.c
@@ -331,9 +331,12 @@ nlm_gc_hosts(void)
}
dprintk("lockd: delete host %s\n", host->h_name);
*q = host->h_next;
- /* Don't unmonitor hosts that have been invalidated */
- if (host->h_monitored && !host->h_killed)
- nsm_unmonitor(host);
+
+ /*
+ * Unmonitor unless host was invalidated (i.e. lockd restarted)
+ */
+ nsm_unmonitor(host);
+
if ((clnt = host->h_rpcclnt) != NULL) {
if (atomic_read(&clnt->cl_users)) {
printk(KERN_WARNING
diff -puN fs/lockd/mon.c~knfsd-hide-use-of-lockds-h_monitored-flag fs/lockd/mon.c
--- a/fs/lockd/mon.c~knfsd-hide-use-of-lockds-h_monitored-flag
+++ a/fs/lockd/mon.c
@@ -74,6 +74,8 @@ nsm_monitor(struct nlm_host *host)
int status;
dprintk("lockd: nsm_monitor(%s)\n", host->h_name);
+ if (host->h_monitored)
+ return 0;
status = nsm_mon_unmon(host, SM_MON, &res);
@@ -91,15 +93,18 @@ int
nsm_unmonitor(struct nlm_host *host)
{
struct nsm_res res;
- int status;
+ int status = 0;
dprintk("lockd: nsm_unmonitor(%s)\n", host->h_name);
-
- status = nsm_mon_unmon(host, SM_UNMON, &res);
- if (status < 0)
- printk(KERN_NOTICE "lockd: cannot unmonitor %s\n", host->h_name);
- else
- host->h_monitored = 0;
+ if (!host->h_monitored)
+ return 0;
+ host->h_monitored = 0;
+
+ if (!host->h_killed) {
+ status = nsm_mon_unmon(host, SM_UNMON, &res);
+ if (status < 0)
+ printk(KERN_NOTICE "lockd: cannot unmonitor %s\n", host->h_name);
+ }
return status;
}
diff -puN fs/lockd/svc4proc.c~knfsd-hide-use-of-lockds-h_monitored-flag fs/lockd/svc4proc.c
--- a/fs/lockd/svc4proc.c~knfsd-hide-use-of-lockds-h_monitored-flag
+++ a/fs/lockd/svc4proc.c
@@ -39,7 +39,7 @@ nlm4svc_retrieve_args(struct svc_rqst *r
/* Obtain host handle */
if (!(host = nlmsvc_lookup_host(rqstp))
- || (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0))
+ || (argp->monitor && nsm_monitor(host) < 0))
goto no_locks;
*hostp = host;
diff -puN fs/lockd/svcproc.c~knfsd-hide-use-of-lockds-h_monitored-flag fs/lockd/svcproc.c
--- a/fs/lockd/svcproc.c~knfsd-hide-use-of-lockds-h_monitored-flag
+++ a/fs/lockd/svcproc.c
@@ -67,7 +67,7 @@ nlmsvc_retrieve_args(struct svc_rqst *rq
/* Obtain host handle */
if (!(host = nlmsvc_lookup_host(rqstp))
- || (argp->monitor && !host->h_monitored && nsm_monitor(host) < 0))
+ || (argp->monitor && nsm_monitor(host) < 0))
goto no_locks;
*hostp = host;
_
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
