Commit 356c3eb4 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields

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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent c8c23c42
......@@ -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;
}
/*
......
......@@ -245,6 +245,7 @@ extern void nlm_host_rebooted(const struct sockaddr_in *, const char *,
* Host monitoring
*/
int nsm_monitor(const struct nlm_host *host);
void nsm_unmonitor(const struct nlm_host *host);
/*
* This is used in garbage collection and resource reclaim
......
......@@ -41,7 +41,6 @@ struct nsm_res {
u32 state;
};
int nsm_unmonitor(struct nlm_host *);
extern int nsm_local_state;
#endif /* LINUX_LOCKD_SM_INTER_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment