From: trondmy@kernel.org
To: linux-nfs@vger.kernel.org
Subject: [PATCH v2 3/3] NFS: Clean up reset of the mirror accounting variables
Date: Tue, 25 May 2021 14:02:41 -0400 [thread overview]
Message-ID: <20210525180241.261090-3-trondmy@kernel.org> (raw)
In-Reply-To: <20210525180241.261090-2-trondmy@kernel.org>
From: Trond Myklebust <trond.myklebust@hammerspace.com>
Now that nfs_pageio_do_add_request() resets the pg_count, we don't need
these other inlined resets.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
fs/nfs/pagelist.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index daf6658517f4..cf9cc62ec48e 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -1132,12 +1132,8 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
int error = desc->pg_ops->pg_doio(desc);
if (error < 0)
desc->pg_error = error;
- if (list_empty(&mirror->pg_list)) {
+ 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;
- }
}
}
@@ -1227,9 +1223,6 @@ 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;
while (!list_empty(&head)) {
struct nfs_page *req;
--
2.31.1
prev parent reply other threads:[~2021-05-25 18:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-25 18:02 [PATCH v2 1/3] NFS: Fix an Oopsable condition in __nfs_pageio_add_request() trondmy
2021-05-25 18:02 ` [PATCH v2 2/3] NFS: Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce() trondmy
2021-05-25 18:02 ` 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=20210525180241.261090-3-trondmy@kernel.org \
--to=trondmy@kernel.org \
--cc=linux-nfs@vger.kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox