From: Chuck Lever <chuck.lever@oracle.com>
To: anna.schumaker@netapp.com
Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH v2 11/20] xprtrdma: Re-organize the switch() in rpcrdma_conn_upcall
Date: Mon, 01 Oct 2018 14:26:03 -0400 [thread overview]
Message-ID: <20181001182603.18578.69348.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20181001182005.18578.57544.stgit@manet.1015granger.net>
Clean up: Eliminate the FALLTHROUGH into the default arm to make the
switch easier to understand.
Also, as long as I'm here, do not display the memory address of the
target rpcrdma_ep. A hashed memory address is of marginal use here.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
net/sunrpc/xprtrdma/verbs.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 422d3db..c60172f 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -243,15 +243,15 @@
case RDMA_CM_EVENT_ROUTE_RESOLVED:
ia->ri_async_rc = 0;
complete(&ia->ri_done);
- break;
+ return 0;
case RDMA_CM_EVENT_ADDR_ERROR:
ia->ri_async_rc = -EPROTO;
complete(&ia->ri_done);
- break;
+ return 0;
case RDMA_CM_EVENT_ROUTE_ERROR:
ia->ri_async_rc = -ENETUNREACH;
complete(&ia->ri_done);
- break;
+ return 0;
case RDMA_CM_EVENT_DEVICE_REMOVAL:
#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
pr_info("rpcrdma: removing device %s for %s:%s\n",
@@ -292,16 +292,15 @@
connected:
rpcrdma_conn_func(ep);
wake_up_all(&ep->rep_connect_wait);
- /*FALLTHROUGH*/
+ break;
default:
- dprintk("RPC: %s: %s:%s on %s/%s (ep 0x%p): %s\n",
- __func__,
- rpcrdma_addrstr(r_xprt), rpcrdma_portstr(r_xprt),
- ia->ri_device->name, ia->ri_ops->ro_displayname,
- ep, rdma_event_msg(event->event));
break;
}
+ dprintk("RPC: %s: %s:%s on %s/%s: %s\n", __func__,
+ rpcrdma_addrstr(r_xprt), rpcrdma_portstr(r_xprt),
+ ia->ri_device->name, ia->ri_ops->ro_displayname,
+ rdma_event_msg(event->event));
return 0;
}
next prev parent reply other threads:[~2018-10-02 1:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-01 18:25 [PATCH v2 00/20] NFS/RDMA client patches for v4.20 Chuck Lever
2018-10-01 18:25 ` [PATCH v2 01/20] xprtrdma: xprt_release_rqst_cong is called outside of transport_lock Chuck Lever
2018-10-01 18:25 ` [PATCH v2 02/20] xprtrdma: Reset credit grant properly after a disconnect Chuck Lever
2018-10-01 18:25 ` [PATCH v2 03/20] xprtrdma: Create more MRs at a time Chuck Lever
2018-10-01 18:25 ` [PATCH v2 04/20] xprtrdma: Explicitly resetting MRs is no longer necessary Chuck Lever
2018-10-01 18:25 ` [PATCH v2 05/20] xprtrdma: Name MR trace events consistently Chuck Lever
2018-10-01 18:25 ` [PATCH v2 06/20] sunrpc: Fix connect metrics Chuck Lever
2018-10-01 18:25 ` [PATCH v2 07/20] sunrpc: Report connect_time in seconds Chuck Lever
2018-10-01 18:25 ` [PATCH v2 08/20] xprtrdma: Rename rpcrdma_conn_upcall Chuck Lever
2018-10-01 18:25 ` [PATCH v2 09/20] xprtrdma: Conventional variable names in rpcrdma_conn_upcall Chuck Lever
2018-10-01 18:25 ` [PATCH v2 10/20] xprtrdma: Eliminate "connstate" variable from rpcrdma_conn_upcall() Chuck Lever
2018-10-01 18:26 ` Chuck Lever [this message]
2018-10-01 18:26 ` [PATCH v2 12/20] xprtrdma: Simplify RPC wake-ups on connect Chuck Lever
2018-10-01 18:26 ` [PATCH v2 13/20] xprtrdma: Rename rpcrdma_qp_async_error_upcall Chuck Lever
2018-10-01 18:26 ` [PATCH v2 14/20] xprtrdma: Remove memory address of "ep" from an error message Chuck Lever
2018-10-01 18:26 ` [PATCH v2 15/20] xprtrdma: Don't disable BH's in backchannel server Chuck Lever
2018-10-01 18:26 ` [PATCH v2 16/20] xprtrdma: Move rb_flags initialization Chuck Lever
2018-10-01 18:26 ` [PATCH v2 17/20] xprtrdma: Report when there were zero posted Receives Chuck Lever
2018-10-01 18:26 ` [PATCH v2 18/20] xprtrdma: Add documenting comments Chuck Lever
2018-10-01 18:26 ` [PATCH v2 19/20] xprtrdma: Clean up xprt_rdma_disconnect_inject Chuck Lever
2018-10-01 18:26 ` [PATCH v2 20/20] xprtrdma: Squelch a sparse warning Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181001182603.18578.69348.stgit@manet.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=anna.schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).