aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2010-10-20 11:52:51 -0400
committerJ. Bruce Fields <bfields@redhat.com>2010-10-21 10:11:46 -0400
commit4232e8634ad82c5a53389e4016de15a8b15c09c3 (patch)
treeb834b51f3856ccfa23bf330e16ab480d3b3cbb7e /net
parenta25e758c5fa1137e1bbc440194e55f7c59177145 (diff)
SUNRPC: Use conventional switch statement when reclassifying sockets
Clean up. Defensive coding: If "family" is ever something that is neither AF_INET nor AF_INET6, xs_reclassify_socket6() is not the appropriate default action. Choose to do nothing in that case. Introduced by commit 6bc9638a. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/xprtsock.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 79155650b7b9..b58eef76a518 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1558,7 +1558,7 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)
1558 nloop++; 1558 nloop++;
1559 } while (err == -EADDRINUSE && nloop != 2); 1559 } while (err == -EADDRINUSE && nloop != 2);
1560 1560
1561 if (myaddr.ss_family == PF_INET) 1561 if (myaddr.ss_family == AF_INET)
1562 dprintk("RPC: %s %pI4:%u: %s (%d)\n", __func__, 1562 dprintk("RPC: %s %pI4:%u: %s (%d)\n", __func__,
1563 &((struct sockaddr_in *)&myaddr)->sin_addr, 1563 &((struct sockaddr_in *)&myaddr)->sin_addr,
1564 port, err ? "failed" : "ok", err); 1564 port, err ? "failed" : "ok", err);
@@ -1594,10 +1594,14 @@ static inline void xs_reclassify_socket6(struct socket *sock)
1594 1594
1595static inline void xs_reclassify_socket(int family, struct socket *sock) 1595static inline void xs_reclassify_socket(int family, struct socket *sock)
1596{ 1596{
1597 if (family == PF_INET) 1597 switch (family) {
1598 case AF_INET:
1598 xs_reclassify_socket4(sock); 1599 xs_reclassify_socket4(sock);
1599 else 1600 break;
1601 case AF_INET6:
1600 xs_reclassify_socket6(sock); 1602 xs_reclassify_socket6(sock);
1603 break;
1604 }
1601} 1605}
1602#else 1606#else
1603static inline void xs_reclassify_socket4(struct socket *sock) 1607static inline void xs_reclassify_socket4(struct socket *sock)