Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7ba597f authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 8529bc51

fs/lockd/mon.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

{

fs/lockd/svc.c

+0 −1
Original line number Diff line number Diff line
@@ -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;