Skip to content

Commit

Permalink
NLM: Move the public declaration of nsm_unmonitor() to lockd.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chuck Lever authored and J. Bruce Fields committed Jan 6, 2009
1 parent c8c23c4 commit 356c3eb
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
15 changes: 9 additions & 6 deletions fs/lockd/mon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -128,7 +132,6 @@ nsm_unmonitor(struct nlm_host *host)
else
nsm->sm_monitored = 0;
}
return status;
}

/*
Expand Down
1 change: 1 addition & 0 deletions include/linux/lockd/lockd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion include/linux/lockd/sm_inter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 356c3eb

Please sign in to comment.