diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2008-12-04 20:21:38 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-01-06 17:53:52 +0100 |
| commit | 356c3eb466fd1a12afd6448d90fba3922836e5f1 (patch) | |
| tree | 1b30ed40ea9ee8c0e548f71d7e36bafd293ad764 /fs | |
| parent | NSM: Release nsmhandle in nlm_destroy_host (diff) | |
| download | linux-356c3eb466fd1a12afd6448d90fba3922836e5f1.tar.xz linux-356c3eb466fd1a12afd6448d90fba3922836e5f1.zip | |
NLM: Move the public declaration of nsm_unmonitor() to lockd.h
Clean up.
Make the nlm_host argument "const," and move the public declaration to
lockd.h. Add a documenting comment.
Bruce observed that nsm_unmonitor()'s only caller doesn't care about
its return code, so make nsm_unmonitor() return void.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/lockd/mon.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index 15fab22db028..d61cdc61cb50 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -107,15 +107,19 @@ int nsm_monitor(const struct nlm_host *host) return status; } -/* - * Cease to monitor remote host +/** + * nsm_unmonitor - Unregister peer notification + * @host: pointer to nlm_host of peer to stop monitoring + * + * If this peer is monitored, this function sends an upcall to + * tell the local rpc.statd not to send this peer a notification + * when we reboot. */ -int -nsm_unmonitor(struct nlm_host *host) +void nsm_unmonitor(const struct nlm_host *host) { struct nsm_handle *nsm = host->h_nsmhandle; struct nsm_res res; - int status = 0; + int status; if (atomic_read(&nsm->sm_count) == 1 && nsm->sm_monitored && !nsm->sm_sticky) { @@ -128,7 +132,6 @@ nsm_unmonitor(struct nlm_host *host) else nsm->sm_monitored = 0; } - return status; } /* |