aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2008-12-04 14:21:24 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-01-06 11:53:52 -0500
commit1e49323c4ab044d05bbc68cf13cadcbd4372468c (patch)
tree5d997638d8595d3698d6e3b2c81292fb09b42ad8 /include
parent5d254b119823658cc318f88589c6c426b3d0a153 (diff)
NLM: Move the public declaration of nsm_monitor() to lockd.h
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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/lockd/lockd.h4
-rw-r--r--include/linux/lockd/sm_inter.h1
2 files changed, 4 insertions, 1 deletions
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);
243void nsm_release(struct nsm_handle *); 243void nsm_release(struct nsm_handle *);
244 244
245/*
246 * Host monitoring
247 */
248int 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
44int nsm_monitor(struct nlm_host *);
45int nsm_unmonitor(struct nlm_host *); 44int nsm_unmonitor(struct nlm_host *);
46extern int nsm_local_state; 45extern int nsm_local_state;
47 46