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

Commit 9f62387d authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix up a merge conflict between migration and container changes 



nfs_callback_tcpport is now per-net_namespace.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 2afdfa5a

fs/nfs/nfs4state.c

+3 −2
Original line number Diff line number Diff line
@@ -121,12 +121,13 @@ int nfs40_discover_server_trunking(struct nfs_client *clp, 
		.clientid = clp->cl_clientid,

		.confirm = clp->cl_confirm,

	};

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

	unsigned short port;

	int status;



	port = nfs_callback_tcpport;

	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)