Commit 29dcc16a authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by Trond Myklebust
Browse files

NFS: make nfs_callback_tcpport6 per network context 



Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent bbe0a3aa

fs/nfs/callback.c

+2 −4
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ static struct nfs_callback_data nfs_callback_info[NFS4_MAX_MINOR_VERSION + 1]; 
static DEFINE_MUTEX(nfs_callback_mutex);

static struct svc_program nfs4_callback_program;



unsigned short nfs_callback_tcpport6;



static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net)

{

	int ret;
@@ -56,9 +54,9 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net) 
	ret = svc_create_xprt(serv, "tcp", net, PF_INET6,

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);

	if (ret > 0) {

		nfs_callback_tcpport6 = ret;

		nn->nfs_callback_tcpport6 = ret;

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

				nfs_callback_tcpport6, PF_INET6, net);

				nn->nfs_callback_tcpport6, PF_INET6, net);

	} else if (ret != -EAFNOSUPPORT)

		goto out_err;

	return 0;

fs/nfs/callback.h

+0 −1
Original line number Diff line number Diff line
@@ -208,6 +208,5 @@ extern int nfs4_set_callback_sessionid(struct nfs_client *clp); 
#define NFS41_BC_MAX_CALLBACKS 1



extern unsigned int nfs_callback_set_tcpport;

extern unsigned short nfs_callback_tcpport6;



#endif /* __LINUX_FS_NFS_CALLBACK_H */

fs/nfs/netns.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ struct nfs_net { 
#if IS_ENABLED(CONFIG_NFS_V4)

	struct idr cb_ident_idr; /* Protected by nfs_client_lock */

	unsigned short nfs_callback_tcpport;

	unsigned short nfs_callback_tcpport6;

#endif

	spinlock_t nfs_client_lock;

	struct timespec boot_time;

fs/nfs/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ int nfs4_init_clientid(struct nfs_client *clp, struct rpc_cred *cred) 
		goto do_confirm;

	port = nn->nfs_callback_tcpport;

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

		port = nfs_callback_tcpport6;

		port = nn->nfs_callback_tcpport6;



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

	if (status != 0)