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

Commit 26298caa authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Revert creation of IPv6 listeners for lockd and NFSv4 callbacks 



We're about to convert over to using separate PF_INET and PF_INET6
listeners, instead of a single PF_INET6 listener that also receives
AF_INET requests and maps them to AF_INET6.

Clear the way by removing the logic in lockd and the NFSv4 callback
server that creates an AF_INET6 service listener.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 49a9072f

fs/lockd/svc.c

+1 −12
Original line number Diff line number Diff line
@@ -52,17 +52,6 @@ static struct task_struct *nlmsvc_task; 
static struct svc_rqst		*nlmsvc_rqst;

unsigned long			nlmsvc_timeout;



/*

 * If the kernel has IPv6 support available, always listen for

 * both AF_INET and AF_INET6 requests.

 */

#if (defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)) && \

	defined(CONFIG_SUNRPC_REGISTER_V4)

static const sa_family_t	nlmsvc_family = AF_INET6;

#else	/* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */

static const sa_family_t	nlmsvc_family = AF_INET;

#endif	/* (CONFIG_IPV6 || CONFIG_IPV6_MODULE) && CONFIG_SUNRPC_REGISTER_V4 */



/*

 * These can be set at insmod time (useful for NFS as root filesystem),

 * and also changed through the sysctl interface.  -- Jamie Lokier, Aug 2003
@@ -211,7 +200,7 @@ static int create_lockd_listener(struct svc_serv *serv, char *name, 


	xprt = svc_find_xprt(serv, name, 0, 0);

	if (xprt == NULL)

		return svc_create_xprt(serv, name, nlmsvc_family,

		return svc_create_xprt(serv, name, PF_INET,

					port, SVC_SOCK_DEFAULTS);



	svc_xprt_put(xprt);

fs/nfs/callback.c

+2 −12
Original line number Diff line number Diff line
@@ -41,16 +41,6 @@ unsigned short nfs_callback_tcpport; 
static const int nfs_set_port_min = 0;

static const int nfs_set_port_max = 65535;



/*

 * If the kernel has IPv6 support available, always listen for

 * both AF_INET and AF_INET6 requests.

 */

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

static const sa_family_t	nfs_callback_family = AF_INET6;

#else

static const sa_family_t	nfs_callback_family = AF_INET;

#endif



static int param_set_port(const char *val, struct kernel_param *kp)

{

	char *endp;
@@ -121,13 +111,13 @@ int nfs_callback_up(void) 
	if (!serv)

		goto out_err;



	ret = svc_create_xprt(serv, "tcp", nfs_callback_family,

	ret = svc_create_xprt(serv, "tcp", PF_INET,

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);

	if (ret <= 0)

		goto out_err;

	nfs_callback_tcpport = ret;

	dprintk("NFS: Callback listener port = %u (af %u)\n",

			nfs_callback_tcpport, nfs_callback_family);

			nfs_callback_tcpport, PF_INET);



	nfs_callback_info.rqst = svc_prepare_thread(serv, &serv->sv_pools[0]);

	if (IS_ERR(nfs_callback_info.rqst)) {