aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-02-08 16:00:01 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-02-09 09:20:40 -0500
commit505936f59f1e4cd0ff92ae5abc7aae64fb74dbdb (patch)
tree0f5ac99a05bea996673d44020bf8a779e8ea415a /net/sunrpc
parent9cbc94fb06f98de0e8d393eaff09c790f4c3ba46 (diff)
SUNRPC: Cleanup to remove remaining uses of XPRT_CONNECTION_ABORT
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/xprtsock.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index c65f74019288..2f8db3499a17 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -804,7 +804,6 @@ static void xs_error_report(struct sock *sk)
804static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt) 804static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt)
805{ 805{
806 smp_mb__before_atomic(); 806 smp_mb__before_atomic();
807 clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
808 clear_bit(XPRT_CONNECTION_CLOSE, &xprt->state); 807 clear_bit(XPRT_CONNECTION_CLOSE, &xprt->state);
809 clear_bit(XPRT_CLOSE_WAIT, &xprt->state); 808 clear_bit(XPRT_CLOSE_WAIT, &xprt->state);
810 clear_bit(XPRT_CLOSING, &xprt->state); 809 clear_bit(XPRT_CLOSING, &xprt->state);
@@ -1904,7 +1903,6 @@ static int xs_local_setup_socket(struct sock_xprt *transport)
1904 struct socket *sock; 1903 struct socket *sock;
1905 int status = -EIO; 1904 int status = -EIO;
1906 1905
1907 clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
1908 status = __sock_create(xprt->xprt_net, AF_LOCAL, 1906 status = __sock_create(xprt->xprt_net, AF_LOCAL,
1909 SOCK_STREAM, 0, &sock, 1); 1907 SOCK_STREAM, 0, &sock, 1);
1910 if (status < 0) { 1908 if (status < 0) {
@@ -2149,7 +2147,6 @@ static void xs_tcp_setup_socket(struct work_struct *work)
2149 int status = -EIO; 2147 int status = -EIO;
2150 2148
2151 if (!sock) { 2149 if (!sock) {
2152 clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
2153 sock = xs_create_sock(xprt, transport, 2150 sock = xs_create_sock(xprt, transport,
2154 xs_addr(xprt)->sa_family, SOCK_STREAM, 2151 xs_addr(xprt)->sa_family, SOCK_STREAM,
2155 IPPROTO_TCP, true); 2152 IPPROTO_TCP, true);