diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2008-01-14 12:32:20 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-01-30 02:06:08 -0500 |
commit | 33e01dc7f578813cda074ceaeaf68b0f3ffcc393 (patch) | |
tree | a1a84d98ae900b8960bd59742f1e2b767e7cb4f8 /net/sunrpc/xprtsock.c | |
parent | c0e07cb68db353c0ffbb0f82401cf6d79c253aed (diff) |
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: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/xprtsock.c')
-rw-r--r-- | net/sunrpc/xprtsock.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index b9b94f49c620..30e7ac243a90 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -398,12 +398,16 @@ static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt, | |||
398 | 398 | ||
399 | static void xs_free_peer_addresses(struct rpc_xprt *xprt) | 399 | static void xs_free_peer_addresses(struct rpc_xprt *xprt) |
400 | { | 400 | { |
401 | kfree(xprt->address_strings[RPC_DISPLAY_ADDR]); | 401 | unsigned int i; |
402 | kfree(xprt->address_strings[RPC_DISPLAY_PORT]); | 402 | |
403 | kfree(xprt->address_strings[RPC_DISPLAY_ALL]); | 403 | for (i = 0; i < RPC_DISPLAY_MAX; i++) |
404 | kfree(xprt->address_strings[RPC_DISPLAY_HEX_ADDR]); | 404 | switch (i) { |
405 | kfree(xprt->address_strings[RPC_DISPLAY_HEX_PORT]); | 405 | case RPC_DISPLAY_PROTO: |
406 | kfree(xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR]); | 406 | case RPC_DISPLAY_NETID: |
407 | continue; | ||
408 | default: | ||
409 | kfree(xprt->address_strings[i]); | ||
410 | } | ||
407 | } | 411 | } |
408 | 412 | ||
409 | #define XS_SENDMSG_FLAGS (MSG_DONTWAIT | MSG_NOSIGNAL) | 413 | #define XS_SENDMSG_FLAGS (MSG_DONTWAIT | MSG_NOSIGNAL) |