]> git.karo-electronics.de Git - linux-beck.git/commitdiff
svcrdma: Further clean-up of svc_rdma_get_inv_rkey()
authorChuck Lever <chuck.lever@oracle.com>
Tue, 29 Nov 2016 16:05:39 +0000 (11:05 -0500)
committerJ. Bruce Fields <bfields@redhat.com>
Wed, 30 Nov 2016 22:31:16 +0000 (17:31 -0500)
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>
net/sunrpc/xprtrdma/svc_rdma_sendto.c

index 30eeab527bd001d0d9facbb80d63b8caa08f52eb..ad4d286a83c5195fe663dd581cd49a5c9f9a6166 100644 (file)
@@ -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: