xprtrdma: Rename rpcrdma_req::rl_free

Clean up: I'm about to use the rl_free field for purposes other than
a free list. So use a more generic name.

This is a refactoring change only.

BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=305
Fixes: 68791649a725 ('xprtrdma: Invalidate in the RPC reply ... ')
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index a8be66d806dcc8ccc7171af8cfa0a74286c8f807..df72224604d2d15b89f2e3f1ceaba3c80c32689d 100644 (file)
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -971,7 +971,6 @@ rpcrdma_create_req(struct rpcrdma_xprt *r_xprt)
        if (req == NULL)
                return ERR_PTR(-ENOMEM);
 
-       INIT_LIST_HEAD(&req->rl_free);
        spin_lock(&buffer->rb_reqslock);
        list_add(&req->rl_all, &buffer->rb_allreqs);
        spin_unlock(&buffer->rb_reqslock);
@@ -1055,7 +1054,7 @@ rpcrdma_buffer_create(struct rpcrdma_xprt *r_xprt)
                        goto out;
                }
                req->rl_backchannel = false;
-               list_add(&req->rl_free, &buf->rb_send_bufs);
+               list_add(&req->rl_list, &buf->rb_send_bufs);
        }
 
        INIT_LIST_HEAD(&buf->rb_recv_bufs);
@@ -1084,8 +1083,8 @@ 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_free);
-       list_del(&req->rl_free);
+                              struct rpcrdma_req, rl_list);
+       list_del(&req->rl_list);
        return req;
 }
 
@@ -1268,7 +1267,7 @@ rpcrdma_buffer_put(struct rpcrdma_req *req)
 
        spin_lock(&buffers->rb_lock);
        buffers->rb_send_count--;
-       list_add_tail(&req->rl_free, &buffers->rb_send_bufs);
+       list_add_tail(&req->rl_list, &buffers->rb_send_bufs);
        if (rep) {
                buffers->rb_recv_count--;
                list_add_tail(&rep->rr_list, &buffers->rb_recv_bufs);

diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index 1c23117bf1b0d828d2c1423f2b67a7a23d5a74c0..ad918c840fc719f7f1f23d04a93d0d0842b0ac30 100644 (file)
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -340,7 +340,7 @@ enum {
 
 struct rpcrdma_buffer;
 struct rpcrdma_req {
-       struct list_head        rl_free;
+       struct list_head        rl_list;
        unsigned int            rl_mapped_sges;
        unsigned int            rl_connect_cookie;
        struct rpcrdma_buffer   *rl_buffer;