diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2008-12-11 17:56:29 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-01-06 11:53:55 -0500 |
| commit | b7ba597fb964dfa44284904b3b3d74d44b8e1c42 (patch) | |
| tree | a03c62f761cc823c29b9bafd083490b2a3627986 | |
| parent | 8529bc51d30b8f001734b29b21a51b579c260f5b (diff) | |
| download | linux-b7ba597fb964dfa44284904b3b3d74d44b8e1c42.tar.bz2 | |
NSM: Move nsm_use_hostnames to mon.c
Clean up.
Treat the nsm_use_hostnames global variable like nsm_local_state.
Note that the default value of nsm_use_hostnames is still zero.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| -rw-r--r-- | fs/lockd/mon.c | 3 | ||||
| -rw-r--r-- | fs/lockd/svc.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index 43be31c4a2de..fafa0ea71938 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -53,7 +53,8 @@ static DEFINE_SPINLOCK(nsm_lock); /* * Local NSM state */ -int nsm_local_state; +int __read_mostly nsm_local_state; +int __read_mostly nsm_use_hostnames; static inline struct sockaddr *nsm_addr(const struct nsm_handle *nsm) { diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 0b13392931a6..7ac7d72e3b5f 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -59,7 +59,6 @@ unsigned long nlmsvc_timeout; static unsigned long nlm_grace_period; static unsigned long nlm_timeout = LOCKD_DFLT_TIMEO; static int nlm_udpport, nlm_tcpport; -int nsm_use_hostnames = 0; /* RLIM_NOFILE defaults to 1024. That seems like a reasonable default here. */ static unsigned int nlm_max_connections = 1024; |