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

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

NFS: Start PF_INET6 callback listener only if IPv6 support is available 



Apparently a lot of people need to disable IPv6 completely on their
distributor-built systems, which have CONFIG_IPV6_MODULE enabled at
build time.

They do this by blacklisting the ipv6.ko module.  This causes the
creation of the NFSv4 callback service listener to fail if
CONFIG_IPV6_MODULE is set, but the module cannot be loaded.

Now that the kernel's PF_INET6 RPC listeners are completely separate
from PF_INET listeners, we can always start PF_INET.  Then the NFS
client can try to start a PF_INET6 listener, but it isn't required
to be available.

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

fs/nfs/callback.c

+12 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ static struct svc_program nfs4_callback_program; 


unsigned int nfs_callback_set_tcpport;

unsigned short nfs_callback_tcpport;

unsigned short nfs_callback_tcpport6;

static const int nfs_set_port_min = 0;

static const int nfs_set_port_max = 65535;
@@ -119,6 +120,17 @@ int nfs_callback_up(void) 
	dprintk("NFS: Callback listener port = %u (af %u)\n",

			nfs_callback_tcpport, PF_INET);



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

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

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);

	if (ret > 0) {

		nfs_callback_tcpport6 = ret;

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

				nfs_callback_tcpport6, PF_INET6);

	} else if (ret != -EAFNOSUPPORT)

		goto out_err;

#endif	/* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */



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

	if (IS_ERR(nfs_callback_info.rqst)) {

		ret = PTR_ERR(nfs_callback_info.rqst);

fs/nfs/callback.h

+1 −0
Original line number Diff line number Diff line
@@ -72,5 +72,6 @@ extern void nfs_callback_down(void); 


extern unsigned int nfs_callback_set_tcpport;

extern unsigned short nfs_callback_tcpport;

extern unsigned short nfs_callback_tcpport6;



#endif /* __LINUX_FS_NFS_CALLBACK_H */

fs/nfs/nfs4state.c

+8 −2
Original line number Diff line number Diff line
@@ -62,8 +62,14 @@ static LIST_HEAD(nfs4_clientid_list); 


static int nfs4_init_client(struct nfs_client *clp, struct rpc_cred *cred)

{

	int status = nfs4_proc_setclientid(clp, NFS4_CALLBACK,

			nfs_callback_tcpport, cred);

	unsigned short port;

	int status;



	port = nfs_callback_tcpport;

	if (clp->cl_addr.ss_family == AF_INET6)

		port = nfs_callback_tcpport6;



	status = nfs4_proc_setclientid(clp, NFS4_CALLBACK, port, cred);

	if (status == 0)

		status = nfs4_proc_setclientid_confirm(clp, cred);

	if (status == 0)