Skip to content

Commit

Permalink
NLM: Move the public declaration of nsm_monitor() 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 with other NSM public function (nsm_release, eg) and global
variable declarations.

Add a documenting comment.

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 5d254b1 commit 1e49323
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
15 changes: 11 additions & 4 deletions fs/lockd/mon.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,18 @@ nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res)
return status;
}

/*
* Set up monitoring of a remote host
/**
* nsm_monitor - Notify a peer in case we reboot
* @host: pointer to nlm_host of peer to notify
*
* If this peer is not already monitored, this function sends an
* upcall to the local rpc.statd to record the name/address of
* the peer to notify in case we reboot.
*
* Returns zero if the peer is monitored by the local rpc.statd;
* otherwise a negative errno value is returned.
*/
int
nsm_monitor(struct nlm_host *host)
int nsm_monitor(const struct nlm_host *host)
{
struct nsm_handle *nsm = host->h_nsmhandle;
struct nsm_res res;
Expand Down
4 changes: 4 additions & 0 deletions include/linux/lockd/lockd.h
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ extern void nlm_host_rebooted(const struct sockaddr_in *, const char *,
unsigned int, u32);
void nsm_release(struct nsm_handle *);

/*
* Host monitoring
*/
int nsm_monitor(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_monitor(struct nlm_host *);
int nsm_unmonitor(struct nlm_host *);
extern int nsm_local_state;

Expand Down

0 comments on commit 1e49323

Please sign in to comment.