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

Commit 20035edf authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Support IPv6 in xprt_rdma_set_port 



Clean up a harmless oversight. xprtrdma's ->set_port method has
never properly supported IPv6.

This issue has never been a problem because NFS/RDMA mounts have
always required "port=20049", thus so far, rpcbind is not invoked
for these mounts.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent dd229cee

net/sunrpc/xprtrdma/transport.c

+24 −4
Original line number Diff line number Diff line
@@ -474,14 +474,34 @@ xprt_rdma_close(struct rpc_xprt *xprt) 
	rpcrdma_ep_disconnect(ep, ia);

}



/**

 * xprt_rdma_set_port - update server port with rpcbind result

 * @xprt: controlling RPC transport

 * @port: new port value

 *

 * Transport connect status is unchanged.

 */

static void

xprt_rdma_set_port(struct rpc_xprt *xprt, u16 port)

{

	struct sockaddr_in *sap;

	struct sockaddr *sap = (struct sockaddr *)&xprt->addr;

	char buf[8];



	dprintk("RPC:       %s: setting port for xprt %p (%s:%s) to %u\n",

		__func__, xprt,

		xprt->address_strings[RPC_DISPLAY_ADDR],

		xprt->address_strings[RPC_DISPLAY_PORT],

		port);



	rpc_set_port(sap, port);



	sap = (struct sockaddr_in *)&xprt->addr;

	sap->sin_port = htons(port);

	dprintk("RPC:       %s: %u\n", __func__, port);

	kfree(xprt->address_strings[RPC_DISPLAY_PORT]);

	snprintf(buf, sizeof(buf), "%u", port);

	xprt->address_strings[RPC_DISPLAY_PORT] = kstrdup(buf, GFP_KERNEL);



	kfree(xprt->address_strings[RPC_DISPLAY_HEX_PORT]);

	snprintf(buf, sizeof(buf), "%4hx", port);

	xprt->address_strings[RPC_DISPLAY_HEX_PORT] = kstrdup(buf, GFP_KERNEL);

}



/**