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

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

SUNRPC: Clean up functions that free address_strings array 



Clean up: document the rule (kfree) and the exceptions
(RPC_DISPLAY_PROTO and RPC_DISPLAY_NETID) when freeing the objects in
a transport's address_strings array.

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

net/sunrpc/xprtrdma/transport.c

+10 −6
Original line number Diff line number Diff line
@@ -212,12 +212,16 @@ xprt_rdma_format_addresses(struct rpc_xprt *xprt) 
static void

xprt_rdma_free_addresses(struct rpc_xprt *xprt)

{

	kfree(xprt->address_strings[RPC_DISPLAY_ADDR]);

	kfree(xprt->address_strings[RPC_DISPLAY_PORT]);

	kfree(xprt->address_strings[RPC_DISPLAY_ALL]);

	kfree(xprt->address_strings[RPC_DISPLAY_HEX_ADDR]);

	kfree(xprt->address_strings[RPC_DISPLAY_HEX_PORT]);

	kfree(xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR]);

	unsigned int i;



	for (i = 0; i < RPC_DISPLAY_MAX; i++)

		switch (i) {

		case RPC_DISPLAY_PROTO:

		case RPC_DISPLAY_NETID:

			continue;

		default:

			kfree(xprt->address_strings[i]);

		}

}



static void

net/sunrpc/xprtsock.c

+10 −6
Original line number Diff line number Diff line
@@ -398,12 +398,16 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt, 


static void xs_free_peer_addresses(struct rpc_xprt *xprt)

{

	kfree(xprt->address_strings[RPC_DISPLAY_ADDR]);

	kfree(xprt->address_strings[RPC_DISPLAY_PORT]);

	kfree(xprt->address_strings[RPC_DISPLAY_ALL]);

	kfree(xprt->address_strings[RPC_DISPLAY_HEX_ADDR]);

	kfree(xprt->address_strings[RPC_DISPLAY_HEX_PORT]);

	kfree(xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR]);

	unsigned int i;



	for (i = 0; i < RPC_DISPLAY_MAX; i++)

		switch (i) {

		case RPC_DISPLAY_PROTO:

		case RPC_DISPLAY_NETID:

			continue;

		default:

			kfree(xprt->address_strings[i]);

		}

}



#define XS_SENDMSG_FLAGS	(MSG_DONTWAIT | MSG_NOSIGNAL)