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>

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 43be31c4a2deb57f73b5d364ac04cfe927c9b1f2..fafa0ea71938b08a46e04035906981cce8b703d2 100644 (file)
--- 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 0b13392931a6fcff9102af6d4e6e2d79f3bb7529..7ac7d72e3b5f46f11d50d6ee7868f0c3e2e86171 100644 (file)
--- 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;