leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xprtrdma: Remove rpcrdma_buffer_get_req_locked()

Browse Source 
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: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Chuck Lever 2018-05-04 15:35:31 -04:00 committed by Anna Schumaker
parent a7986f0998
commit e68699cc1a
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/sunrpc/xprtrdma/verbs.c
View File

@ -1175,17 +1175,6 @@ out:
return rc; 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 * static struct rpcrdma_rep *
rpcrdma_buffer_get_rep_locked(struct rpcrdma_buffer *buf) rpcrdma_buffer_get_rep_locked(struct rpcrdma_buffer *buf)
{ {
@ -1351,15 +1340,12 @@ rpcrdma_buffer_get(struct rpcrdma_buffer *buffers)
struct rpcrdma_req *req; struct rpcrdma_req *req;
spin_lock(&buffers->rb_lock); spin_lock(&buffers->rb_lock);
if (unlikely(list_empty(&buffers->rb_send_bufs))) req = list_first_entry_or_null(&buffers->rb_send_bufs,
goto out_noreqs; struct rpcrdma_req, rl_list);
req = rpcrdma_buffer_get_req_locked(buffers); if (req)
list_del_init(&req->rl_list);
spin_unlock(&buffers->rb_lock); spin_unlock(&buffers->rb_lock);
return req; return req;
out_noreqs:
spin_unlock(&buffers->rb_lock);
return NULL;
} }
/** /**