All of lore.kernel.org
 help / color / mirror / Atom feed
From: trondmy@kernel.org
To: linux-nfs@vger.kernel.org
Subject: [PATCH 3/3] NFS: Clean up reset of the mirror accounting variables
Date: Tue, 25 May 2021 11:32:31 -0400	[thread overview]
Message-ID: <20210525153231.240329-3-trondmy@kernel.org> (raw)
In-Reply-To: <20210525153231.240329-2-trondmy@kernel.org>

From: Trond Myklebust <trond.myklebust@hammerspace.com>

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
 fs/nfs/pagelist.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index a5d3e2a12ae9..855f159fe9da 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -810,6 +810,13 @@ static void nfs_pgio_release(void *calldata)
 	hdr->completion_ops->completion(hdr);
 }
 
+static void nfs_pageio_mirror_reset(struct nfs_pgio_mirror *mirror)
+{
+	mirror->pg_count = 0;
+	mirror->pg_base = 0;
+	mirror->pg_recoalesce = 0;
+}
+
 static void nfs_pageio_mirror_init(struct nfs_pgio_mirror *mirror,
 				   unsigned int bsize)
 {
@@ -1133,9 +1140,7 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
 	}
 	if (list_empty(&mirror->pg_list)) {
 		mirror->pg_bytes_written += mirror->pg_count;
-		mirror->pg_count = 0;
-		mirror->pg_base = 0;
-		mirror->pg_recoalesce = 0;
+		nfs_pageio_mirror_reset(mirror);
 	}
 }
 
@@ -1225,9 +1230,7 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)
 
 	do {
 		list_splice_init(&mirror->pg_list, &head);
-		mirror->pg_count = 0;
-		mirror->pg_base = 0;
-		mirror->pg_recoalesce = 0;
+		nfs_pageio_mirror_reset(mirror);
 
 		while (!list_empty(&head)) {
 			struct nfs_page *req;
@@ -1275,9 +1278,7 @@ static void nfs_pageio_error_cleanup(struct nfs_pageio_descriptor *desc)
 		mirror = nfs_pgio_get_mirror(desc, midx);
 		desc->pg_completion_ops->error_cleanup(&mirror->pg_list,
 				desc->pg_error);
-		mirror->pg_count = 0;
-		mirror->pg_base = 0;
-		mirror->pg_recoalesce = 0;
+		nfs_pageio_mirror_reset(mirror);
 	}
 }
 
-- 
2.31.1


      reply	other threads:[~2021-05-25 15:32 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-25 15:32 [PATCH 1/3] NFS: Fix an Oopsable condition in __nfs_pageio_add_request() trondmy
2021-05-25 15:32 ` [PATCH 2/3] NFS: Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce() trondmy
2021-05-25 15:32   ` trondmy [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210525153231.240329-3-trondmy@kernel.org \
    --to=trondmy@kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --subject='Re: [PATCH 3/3] NFS: Clean up reset of the mirror accounting variables' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.