Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fafedf81 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

svcrdma: Further clean-up of svc_rdma_get_inv_rkey() 



No longer any need for the dprintk().

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 07257450

net/sunrpc/xprtrdma/svc_rdma_sendto.c

+5 −14
Original line number Original line Diff line number Diff line
@@ -199,31 +199,22 @@ static u32 svc_rdma_get_inv_rkey(struct rpcrdma_msg *rdma_argp, 
{

{

	struct rpcrdma_read_chunk *rd_ary;

	struct rpcrdma_read_chunk *rd_ary;

	struct rpcrdma_segment *arg_ch;

	struct rpcrdma_segment *arg_ch;

	u32 inv_rkey;



	inv_rkey = 0;





	rd_ary = (struct rpcrdma_read_chunk *)&rdma_argp->rm_body.rm_chunks[0];

	rd_ary = (struct rpcrdma_read_chunk *)&rdma_argp->rm_body.rm_chunks[0];

	if (rd_ary->rc_discrim != xdr_zero) {

	if (rd_ary->rc_discrim != xdr_zero)

		inv_rkey = be32_to_cpu(rd_ary->rc_target.rs_handle);

		return be32_to_cpu(rd_ary->rc_target.rs_handle);

		goto out;

	}





	if (wr_ary && be32_to_cpu(wr_ary->wc_nchunks)) {

	if (wr_ary && be32_to_cpu(wr_ary->wc_nchunks)) {

		arg_ch = &wr_ary->wc_array[0].wc_target;

		arg_ch = &wr_ary->wc_array[0].wc_target;

		inv_rkey = be32_to_cpu(arg_ch->rs_handle);

		return be32_to_cpu(arg_ch->rs_handle);

		goto out;

	}

	}





	if (rp_ary && be32_to_cpu(rp_ary->wc_nchunks)) {

	if (rp_ary && be32_to_cpu(rp_ary->wc_nchunks)) {

		arg_ch = &rp_ary->wc_array[0].wc_target;

		arg_ch = &rp_ary->wc_array[0].wc_target;

		inv_rkey = be32_to_cpu(arg_ch->rs_handle);

		return be32_to_cpu(arg_ch->rs_handle);

		goto out;

	}

	}





out:

	return 0;

	dprintk("svcrdma: Send With Invalidate rkey=%08x\n", inv_rkey);

	return inv_rkey;

}

}





/* Assumptions:

/* Assumptions: