Commit 6bc9638a authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by J. Bruce Fields
Browse files

sunrpc: Merge xs_create_sock code



After xs_bind is merged it's easy to merge its callers.
Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
[bfields@redhat.com: fix address family initialization]
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent beb59b68
...@@ -1591,6 +1591,14 @@ static inline void xs_reclassify_socket6(struct socket *sock) ...@@ -1591,6 +1591,14 @@ static inline void xs_reclassify_socket6(struct socket *sock)
sock_lock_init_class_and_name(sk, "slock-AF_INET6-RPC", sock_lock_init_class_and_name(sk, "slock-AF_INET6-RPC",
&xs_slock_key[1], "sk_lock-AF_INET6-RPC", &xs_key[1]); &xs_slock_key[1], "sk_lock-AF_INET6-RPC", &xs_key[1]);
} }
static inline void xs_reclassify_socket(int family, struct socket *sock)
{
if (family == PF_INET)
xs_reclassify_socket4(sock);
else
xs_reclassify_socket6(sock);
}
#else #else
static inline void xs_reclassify_socket4(struct socket *sock) static inline void xs_reclassify_socket4(struct socket *sock)
{ {
...@@ -1599,22 +1607,26 @@ static inline void xs_reclassify_socket4(struct socket *sock) ...@@ -1599,22 +1607,26 @@ static inline void xs_reclassify_socket4(struct socket *sock)
static inline void xs_reclassify_socket6(struct socket *sock) static inline void xs_reclassify_socket6(struct socket *sock)
{ {
} }
static inline void xs_reclassify_socket(int family, struct socket *sock)
{
}
#endif #endif
static struct socket *xs_create_sock4(struct rpc_xprt *xprt, static struct socket *xs_create_sock(struct rpc_xprt *xprt,
struct sock_xprt *transport, int type, int protocol) struct sock_xprt *transport, int family, int type, int protocol)
{ {
struct socket *sock; struct socket *sock;
int err; int err;
err = __sock_create(xprt->xprt_net, PF_INET, type, protocol, &sock, 1); err = __sock_create(xprt->xprt_net, family, type, protocol, &sock, 1);
if (err < 0) { if (err < 0) {
dprintk("RPC: can't create %d transport socket (%d).\n", dprintk("RPC: can't create %d transport socket (%d).\n",
protocol, -err); protocol, -err);
goto out; goto out;
} }
transport->srcaddr.ss_family = AF_INET; transport->srcaddr.ss_family = family;
xs_reclassify_socket4(sock); xs_reclassify_socket(family, sock);
if (xs_bind(transport, sock)) { if (xs_bind(transport, sock)) {
sock_release(sock); sock_release(sock);
...@@ -1626,29 +1638,16 @@ out: ...@@ -1626,29 +1638,16 @@ out:
return ERR_PTR(err); return ERR_PTR(err);
} }
static struct socket *xs_create_sock6(struct rpc_xprt *xprt, static struct socket *xs_create_sock4(struct rpc_xprt *xprt,
struct sock_xprt *transport, int type, int protocol) struct sock_xprt *transport, int type, int protocol)
{ {
struct socket *sock; return xs_create_sock(xprt, transport, PF_INET, type, protocol);
int err; }
err = __sock_create(xprt->xprt_net, PF_INET6, type, protocol, &sock, 1);
if (err < 0) {
dprintk("RPC: can't create %d transport socket (%d).\n",
protocol, -err);
goto out;
}
transport->srcaddr.ss_family = AF_INET6;
xs_reclassify_socket6(sock);
if (xs_bind(transport, sock)) {
sock_release(sock);
goto out;
}
return sock; static struct socket *xs_create_sock6(struct rpc_xprt *xprt,
out: struct sock_xprt *transport, int type, int protocol)
return ERR_PTR(err); {
return xs_create_sock(xprt, transport, PF_INET6, type, protocol);
} }
static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment