Commit e68699cc authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Remove rpcrdma_buffer_get_req_locked() 



Clean up. There is only one call-site for this helper, and it can be
simplified by using list_first_entry_or_null().

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent a7986f09

net/sunrpc/xprtrdma/verbs.c

+4 −18
Original line number Diff line number Diff line
@@ -1175,17 +1175,6 @@ rpcrdma_buffer_create(struct rpcrdma_xprt *r_xprt) 
	return rc;

}



static struct rpcrdma_req *

rpcrdma_buffer_get_req_locked(struct rpcrdma_buffer *buf)

{

	struct rpcrdma_req *req;



	req = list_first_entry(&buf->rb_send_bufs,

			       struct rpcrdma_req, rl_list);

	list_del_init(&req->rl_list);

	return req;

}



static struct rpcrdma_rep *

rpcrdma_buffer_get_rep_locked(struct rpcrdma_buffer *buf)

{
@@ -1351,15 +1340,12 @@ rpcrdma_buffer_get(struct rpcrdma_buffer *buffers) 
	struct rpcrdma_req *req;



	spin_lock(&buffers->rb_lock);

	if (unlikely(list_empty(&buffers->rb_send_bufs)))

		goto out_noreqs;

	req = rpcrdma_buffer_get_req_locked(buffers);

	req = list_first_entry_or_null(&buffers->rb_send_bufs,

				       struct rpcrdma_req, rl_list);

	if (req)

		list_del_init(&req->rl_list);

	spin_unlock(&buffers->rb_lock);

	return req;



out_noreqs:

	spin_unlock(&buffers->rb_lock);

	return NULL;

}



/**