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

NFS: make nfs_callback_tcpport per network context 



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

fs/nfs/callback.c

+4 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "nfs4_fs.h"

#include "callback.h"

#include "internal.h"

#include "netns.h"



#define NFSDBG_FACILITY NFSDBG_CALLBACK
@@ -42,14 +43,15 @@ unsigned short nfs_callback_tcpport6; 
static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net)

{

	int ret;

	struct nfs_net *nn = net_generic(net, nfs_net_id);



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

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);

	if (ret <= 0)

		goto out_err;

	nfs_callback_tcpport = ret;

	nn->nfs_callback_tcpport = ret;

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

			nfs_callback_tcpport, PF_INET, net);

			nn->nfs_callback_tcpport, PF_INET, net);



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

				nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS);

fs/nfs/callback.h

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ 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_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
@@ -22,6 +22,7 @@ struct nfs_net { 
	struct list_head nfs_volume_list;

#if IS_ENABLED(CONFIG_NFS_V4)

	struct idr cb_ident_idr; /* Protected by nfs_client_lock */

	unsigned short nfs_callback_tcpport;

#endif

	spinlock_t nfs_client_lock;

	struct timespec boot_time;

fs/nfs/nfs4state.c

+3 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include "delegation.h"

#include "internal.h"

#include "pnfs.h"

#include "netns.h"



#define NFSDBG_FACILITY		NFSDBG_STATE
@@ -73,10 +74,11 @@ int nfs4_init_clientid(struct nfs_client *clp, struct rpc_cred *cred) 
	};

	unsigned short port;

	int status;

	struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id);



	if (test_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state))

		goto do_confirm;

	port = nfs_callback_tcpport;

	port = nn->nfs_callback_tcpport;

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

		port = nfs_callback_tcpport6;