diff options
| -rw-r--r-- | fs/lockd/mon.c | 15 | ||||
| -rw-r--r-- | include/linux/lockd/lockd.h | 4 | ||||
| -rw-r--r-- | include/linux/lockd/sm_inter.h | 1 |
3 files changed, 15 insertions, 5 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index 07e16b81498d..aaaa08e7ae7a 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c | |||
| @@ -69,11 +69,18 @@ nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res) | |||
| 69 | return status; | 69 | return status; |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | /* | 72 | /** |
| 73 | * Set up monitoring of a remote host | 73 | * nsm_monitor - Notify a peer in case we reboot |
| 74 | * @host: pointer to nlm_host of peer to notify | ||
| 75 | * | ||
| 76 | * If this peer is not already monitored, this function sends an | ||
| 77 | * upcall to the local rpc.statd to record the name/address of | ||
| 78 | * the peer to notify in case we reboot. | ||
| 79 | * | ||
| 80 | * Returns zero if the peer is monitored by the local rpc.statd; | ||
| 81 | * otherwise a negative errno value is returned. | ||
| 74 | */ | 82 | */ |
| 75 | int | 83 | int nsm_monitor(const struct nlm_host *host) |
| 76 | nsm_monitor(struct nlm_host *host) | ||
| 77 | { | 84 | { |
| 78 | struct nsm_handle *nsm = host->h_nsmhandle; | 85 | struct nsm_handle *nsm = host->h_nsmhandle; |
| 79 | struct nsm_res res; | 86 | struct nsm_res res; |
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index d3c7247d23e8..f15a4f5ccbfb 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
| @@ -242,6 +242,10 @@ extern void nlm_host_rebooted(const struct sockaddr_in *, const char *, | |||
| 242 | unsigned int, u32); | 242 | unsigned int, u32); |
| 243 | void nsm_release(struct nsm_handle *); | 243 | void nsm_release(struct nsm_handle *); |
| 244 | 244 | ||
| 245 | /* | ||
| 246 | * Host monitoring | ||
| 247 | */ | ||
| 248 | int nsm_monitor(const struct nlm_host *host); | ||
| 245 | 249 | ||
| 246 | /* | 250 | /* |
| 247 | * This is used in garbage collection and resource reclaim | 251 | * This is used in garbage collection and resource reclaim |
diff --git a/include/linux/lockd/sm_inter.h b/include/linux/lockd/sm_inter.h index 5a5448bdb17d..546b6102b0d7 100644 --- a/include/linux/lockd/sm_inter.h +++ b/include/linux/lockd/sm_inter.h | |||
| @@ -41,7 +41,6 @@ struct nsm_res { | |||
| 41 | u32 state; | 41 | u32 state; |
| 42 | }; | 42 | }; |
| 43 | 43 | ||
| 44 | int nsm_monitor(struct nlm_host *); | ||
| 45 | int nsm_unmonitor(struct nlm_host *); | 44 | int nsm_unmonitor(struct nlm_host *); |
| 46 | extern int nsm_local_state; | 45 | extern int nsm_local_state; |
| 47 | 46 | ||
