redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

NLM: Move the public declaration of nsm_unmonitor() to lockd.h

Browse source 
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>
This commit is contained in:
Chuck Lever 2008-12-04 14:21:38 -05:00 committed by J. Bruce Fields
parent c8c23c423d
commit 356c3eb466
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fs/lockd/mon.c
View file

@ -107,15 +107,19 @@ int nsm_monitor(const struct nlm_host *host)
return status; 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 void nsm_unmonitor(const struct nlm_host *host)
nsm_unmonitor(struct nlm_host *host)
{ {
struct nsm_handle *nsm = host->h_nsmhandle; struct nsm_handle *nsm = host->h_nsmhandle;
struct nsm_res res; struct nsm_res res;
int status = 0; int status;
if (atomic_read(&nsm->sm_count) == 1 if (atomic_read(&nsm->sm_count) == 1
&& nsm->sm_monitored && !nsm->sm_sticky) { && nsm->sm_monitored && !nsm->sm_sticky) {
@ -128,7 +132,6 @@ nsm_unmonitor(struct nlm_host *host)
else else
nsm->sm_monitored = 0; nsm->sm_monitored = 0;
} }
return status;
} }
/* /*

1
include/linux/lockd/lockd.h
View file

@ -245,6 +245,7 @@ extern void nlm_host_rebooted(const struct sockaddr_in *, const char *,
* Host monitoring * Host monitoring
*/ */
int nsm_monitor(const struct nlm_host *host); 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 * This is used in garbage collection and resource reclaim

1
include/linux/lockd/sm_inter.h
View file

@ -41,7 +41,6 @@ struct nsm_res {
u32 state; u32 state;
}; };
int nsm_unmonitor(struct nlm_host *);
extern int nsm_local_state; extern int nsm_local_state;
#endif /* LINUX_LOCKD_SM_INTER_H */ #endif /* LINUX_LOCKD_SM_INTER_H */