NFS: Clean up list moves of struct nfs_page

BugLink: https://bugs.launchpad.net/bugs/1843338
[ Upstream commit 078b5fd92c4913dd367361db6c28568386077c89 ]

In several places we're just moving the struct nfs_page from one list to
another by first removing from the existing list, then adding to the new
one.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 89c03a507dd9d9ed88074690dbf56fbd2a6f7b9c..0c5e56702b19ee4a5caf7645f4354b529fc94b19 100644 (file)
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -664,8 +664,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)
 
        list_for_each_entry_safe(req, tmp, &reqs, wb_list) {
                if (!nfs_pageio_add_request(&desc, req)) {
-                       nfs_list_remove_request(req);
-                       nfs_list_add_request(req, &failed);
+                       nfs_list_move_request(req, &failed);
                        spin_lock(&cinfo.inode->i_lock);
                        dreq->flags = 0;
                        if (desc.pg_error < 0)

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 28b013d1d44aef444691bfae74b3c26ff0a1bad5..a7aa028a5b0bb4dd39022c0bb46bc462dca7dbd2 100644 (file)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -768,8 +768,7 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,
        pageused = 0;
        while (!list_empty(head)) {
                req = nfs_list_entry(head->next);
-               nfs_list_remove_request(req);
-               nfs_list_add_request(req, &hdr->pages);
+               nfs_list_move_request(req, &hdr->pages);
 
                if (!last_page || last_page != req->wb_page) {
                        pageused++;
@@ -961,8 +960,7 @@ static int nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc,
        }
        if (!nfs_can_coalesce_requests(prev, req, desc))
                return 0;
-       nfs_list_remove_request(req);
-       nfs_list_add_request(req, &mirror->pg_list);
+       nfs_list_move_request(req, &mirror->pg_list);
        mirror->pg_count += req->wb_bytes;
        return 1;
 }
@@ -994,8 +992,7 @@ nfs_pageio_cleanup_request(struct nfs_pageio_descriptor *desc,
 {
        LIST_HEAD(head);
 
-       nfs_list_remove_request(req);
-       nfs_list_add_request(req, &head);
+       nfs_list_move_request(req, &head);
        desc->pg_completion_ops->error_cleanup(&head);
 }
 
@@ -1241,9 +1238,8 @@ int nfs_pageio_resend(struct nfs_pageio_descriptor *desc,
        while (!list_empty(&hdr->pages)) {
                struct nfs_page *req = nfs_list_entry(hdr->pages.next);
 
-               nfs_list_remove_request(req);
                if (!nfs_pageio_add_request(desc, req))
-                       nfs_list_add_request(req, &failed);
+                       nfs_list_move_request(req, &failed);
        }
        nfs_pageio_complete(desc);
        if (!list_empty(&failed)) {

diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h
index e27572d30d97751ba70a9c5d753997faaac49d51..ad69430fd0eb5a9123727e2054682971de3feca3 100644 (file)
--- a/include/linux/nfs_page.h
+++ b/include/linux/nfs_page.h
@@ -164,6 +164,16 @@ nfs_list_add_request(struct nfs_page *req, struct list_head *head)
        list_add_tail(&req->wb_list, head);
 }
 
+/**
+ * nfs_list_move_request - Move a request to a new list
+ * @req: request
+ * @head: head of list into which to insert the request.
+ */
+static inline void
+nfs_list_move_request(struct nfs_page *req, struct list_head *head)
+{
+       list_move_tail(&req->wb_list, head);
+}
 
 /**
  * nfs_list_remove_request - Remove a request from its wb_list