diff options
| author | Olaf Kirch | 2006-10-04 11:15:51 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-10-04 16:55:16 +0200 |
| commit | 977faf392fc898407554bbe7338d57b29e3660cf (patch) | |
| tree | 9bd611c100e3e2d1aa336010124cda0155183bb8 /fs/lockd/svc4proc.c | |
| parent | [PATCH] knfsd: knfsd: cache ipmap per TCP socket (diff) | |
| download | kernel-qcow2-linux-977faf392fc898407554bbe7338d57b29e3660cf.tar.gz kernel-qcow2-linux-977faf392fc898407554bbe7338d57b29e3660cf.tar.xz kernel-qcow2-linux-977faf392fc898407554bbe7338d57b29e3660cf.zip | |
[PATCH] knfsd: hide use of lockd's h_monitored flag
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@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>
Diffstat (limited to 'fs/lockd/svc4proc.c')
| -rw-r--r-- | fs/lockd/svc4proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c index a2dd9ccb9b32..b5aceb83f8cb 100644 --- a/fs/lockd/svc4proc.c +++ b/fs/lockd/svc4proc.c @@ -39,7 +39,7 @@ nlm4svc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp, /* 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; |