From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 4 May 2018 15:35:31 -0400
Subject: xprtrdma: Remove rpcrdma_buffer_get_req_locked()
Patch-mainline: v4.18-rc1
Git-commit: e68699cc1a025d24608cf1533abc2edd7256d82c
References: bsc#1103992 FATE#326009
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>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
net/sunrpc/xprtrdma/verbs.c | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -1176,17 +1176,6 @@ out:
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)
{
@@ -1352,15 +1341,12 @@ rpcrdma_buffer_get(struct rpcrdma_buffer
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;
}
/**