mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
xprtrdma: Eliminate "connstate" variable from rpcrdma_conn_upcall()
Clean up.
Since commit 173b8f49b3
("xprtrdma: Demote "connect" log messages")
there has been no need to initialize connstat to zero. In fact, in
this code path there's now no reason not to set rep_connected
directly.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
parent
ed97f1f79b
commit
aadc5a9448
1 changed files with 6 additions and 8 deletions
|
@ -234,7 +234,6 @@ rpcrdma_cm_event_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
|
||||||
struct rpcrdma_ia *ia = &r_xprt->rx_ia;
|
struct rpcrdma_ia *ia = &r_xprt->rx_ia;
|
||||||
struct rpcrdma_ep *ep = &r_xprt->rx_ep;
|
struct rpcrdma_ep *ep = &r_xprt->rx_ep;
|
||||||
struct rpc_xprt *xprt = &r_xprt->rx_xprt;
|
struct rpc_xprt *xprt = &r_xprt->rx_xprt;
|
||||||
int connstate = 0;
|
|
||||||
|
|
||||||
might_sleep();
|
might_sleep();
|
||||||
|
|
||||||
|
@ -270,28 +269,27 @@ rpcrdma_cm_event_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
|
||||||
return 1;
|
return 1;
|
||||||
case RDMA_CM_EVENT_ESTABLISHED:
|
case RDMA_CM_EVENT_ESTABLISHED:
|
||||||
++xprt->connect_cookie;
|
++xprt->connect_cookie;
|
||||||
connstate = 1;
|
ep->rep_connected = 1;
|
||||||
rpcrdma_update_connect_private(r_xprt, &event->param.conn);
|
rpcrdma_update_connect_private(r_xprt, &event->param.conn);
|
||||||
goto connected;
|
goto connected;
|
||||||
case RDMA_CM_EVENT_CONNECT_ERROR:
|
case RDMA_CM_EVENT_CONNECT_ERROR:
|
||||||
connstate = -ENOTCONN;
|
ep->rep_connected = -ENOTCONN;
|
||||||
goto connected;
|
goto connected;
|
||||||
case RDMA_CM_EVENT_UNREACHABLE:
|
case RDMA_CM_EVENT_UNREACHABLE:
|
||||||
connstate = -ENETUNREACH;
|
ep->rep_connected = -ENETUNREACH;
|
||||||
goto connected;
|
goto connected;
|
||||||
case RDMA_CM_EVENT_REJECTED:
|
case RDMA_CM_EVENT_REJECTED:
|
||||||
dprintk("rpcrdma: connection to %s:%s rejected: %s\n",
|
dprintk("rpcrdma: connection to %s:%s rejected: %s\n",
|
||||||
rpcrdma_addrstr(r_xprt), rpcrdma_portstr(r_xprt),
|
rpcrdma_addrstr(r_xprt), rpcrdma_portstr(r_xprt),
|
||||||
rdma_reject_msg(id, event->status));
|
rdma_reject_msg(id, event->status));
|
||||||
connstate = -ECONNREFUSED;
|
ep->rep_connected = -ECONNREFUSED;
|
||||||
if (event->status == IB_CM_REJ_STALE_CONN)
|
if (event->status == IB_CM_REJ_STALE_CONN)
|
||||||
connstate = -EAGAIN;
|
ep->rep_connected = -EAGAIN;
|
||||||
goto connected;
|
goto connected;
|
||||||
case RDMA_CM_EVENT_DISCONNECTED:
|
case RDMA_CM_EVENT_DISCONNECTED:
|
||||||
++xprt->connect_cookie;
|
++xprt->connect_cookie;
|
||||||
connstate = -ECONNABORTED;
|
ep->rep_connected = -ECONNABORTED;
|
||||||
connected:
|
connected:
|
||||||
ep->rep_connected = connstate;
|
|
||||||
rpcrdma_conn_func(ep);
|
rpcrdma_conn_func(ep);
|
||||||
wake_up_all(&ep->rep_connect_wait);
|
wake_up_all(&ep->rep_connect_wait);
|
||||||
/*FALLTHROUGH*/
|
/*FALLTHROUGH*/
|
||||||
|
|
Loading…
Reference in a new issue