diff options
Diffstat (limited to 'fs/lockd/mon.c')
-rw-r--r-- | fs/lockd/mon.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index f956651d0f65..e3015464fbab 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <linux/utsname.h> | 10 | #include <linux/utsname.h> |
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/ktime.h> | 12 | #include <linux/ktime.h> |
13 | #include <linux/slab.h> | ||
13 | 14 | ||
14 | #include <linux/sunrpc/clnt.h> | 15 | #include <linux/sunrpc/clnt.h> |
15 | #include <linux/sunrpc/xprtsock.h> | 16 | #include <linux/sunrpc/xprtsock.h> |
@@ -349,9 +350,9 @@ retry: | |||
349 | * nsm_reboot_lookup - match NLMPROC_SM_NOTIFY arguments to an nsm_handle | 350 | * nsm_reboot_lookup - match NLMPROC_SM_NOTIFY arguments to an nsm_handle |
350 | * @info: pointer to NLMPROC_SM_NOTIFY arguments | 351 | * @info: pointer to NLMPROC_SM_NOTIFY arguments |
351 | * | 352 | * |
352 | * Returns a matching nsm_handle if found in the nsm cache; the returned | 353 | * Returns a matching nsm_handle if found in the nsm cache. The returned |
353 | * nsm_handle's reference count is bumped and sm_monitored is cleared. | 354 | * nsm_handle's reference count is bumped. Otherwise returns NULL if some |
354 | * Otherwise returns NULL if some error occurred. | 355 | * error occurred. |
355 | */ | 356 | */ |
356 | struct nsm_handle *nsm_reboot_lookup(const struct nlm_reboot *info) | 357 | struct nsm_handle *nsm_reboot_lookup(const struct nlm_reboot *info) |
357 | { | 358 | { |
@@ -370,12 +371,6 @@ struct nsm_handle *nsm_reboot_lookup(const struct nlm_reboot *info) | |||
370 | atomic_inc(&cached->sm_count); | 371 | atomic_inc(&cached->sm_count); |
371 | spin_unlock(&nsm_lock); | 372 | spin_unlock(&nsm_lock); |
372 | 373 | ||
373 | /* | ||
374 | * During subsequent lock activity, force a fresh | ||
375 | * notification to be set up for this host. | ||
376 | */ | ||
377 | cached->sm_monitored = 0; | ||
378 | |||
379 | dprintk("lockd: host %s (%s) rebooted, cnt %d\n", | 374 | dprintk("lockd: host %s (%s) rebooted, cnt %d\n", |
380 | cached->sm_name, cached->sm_addrbuf, | 375 | cached->sm_name, cached->sm_addrbuf, |
381 | atomic_read(&cached->sm_count)); | 376 | atomic_read(&cached->sm_count)); |