diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2016-11-29 11:05:39 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2016-11-30 17:31:16 -0500 |
| commit | fafedf81700d7d694b3716a14bc55bf4227344c7 (patch) | |
| tree | ef35cb7d8665d48dff535cdeb897feae18c7bb0d /net/sunrpc | |
| parent | 07257450208b82b75103abcca34c6678f5ce51ad (diff) | |
| download | linux-stable-fafedf81700d7d694b3716a14bc55bf4227344c7.tar.gz linux-stable-fafedf81700d7d694b3716a14bc55bf4227344c7.tar.bz2 linux-stable-fafedf81700d7d694b3716a14bc55bf4227344c7.zip | |
svcrdma: Further clean-up of svc_rdma_get_inv_rkey()
No longer any need for the dprintk().
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_sendto.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c index 30eeab527bd0..ad4d286a83c5 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c @@ -199,31 +199,22 @@ static u32 svc_rdma_get_inv_rkey(struct rpcrdma_msg *rdma_argp, { struct rpcrdma_read_chunk *rd_ary; struct rpcrdma_segment *arg_ch; - u32 inv_rkey; - - inv_rkey = 0; rd_ary = (struct rpcrdma_read_chunk *)&rdma_argp->rm_body.rm_chunks[0]; - if (rd_ary->rc_discrim != xdr_zero) { - inv_rkey = be32_to_cpu(rd_ary->rc_target.rs_handle); - goto out; - } + if (rd_ary->rc_discrim != xdr_zero) + return be32_to_cpu(rd_ary->rc_target.rs_handle); if (wr_ary && be32_to_cpu(wr_ary->wc_nchunks)) { arg_ch = &wr_ary->wc_array[0].wc_target; - inv_rkey = be32_to_cpu(arg_ch->rs_handle); - goto out; + return be32_to_cpu(arg_ch->rs_handle); } if (rp_ary && be32_to_cpu(rp_ary->wc_nchunks)) { arg_ch = &rp_ary->wc_array[0].wc_target; - inv_rkey = be32_to_cpu(arg_ch->rs_handle); - goto out; + return be32_to_cpu(arg_ch->rs_handle); } -out: - dprintk("svcrdma: Send With Invalidate rkey=%08x\n", inv_rkey); - return inv_rkey; + return 0; } /* Assumptions: |