From 7da24659cbd5d5ba6358d30cd46c07b0863366bd Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 11 Dec 2008 17:56:29 -0500
Subject: [PATCH] --- yaml --- r: 127474 b: refs/heads/master c:
 b7ba597fb964dfa44284904b3b3d74d44b8e1c42 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/lockd/mon.c | 3 ++-
 trunk/fs/lockd/svc.c | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ed0d55359651..a39c211bdca2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8529bc51d30b8f001734b29b21a51b579c260f5b
+refs/heads/master: b7ba597fb964dfa44284904b3b3d74d44b8e1c42
diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c
index 43be31c4a2de..fafa0ea71938 100644
--- a/trunk/fs/lockd/mon.c
+++ b/trunk/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/trunk/fs/lockd/svc.c b/trunk/fs/lockd/svc.c
index 0b13392931a6..7ac7d72e3b5f 100644
--- a/trunk/fs/lockd/svc.c
+++ b/trunk/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;