[PATCH v2 3/3] NFS: Clean up reset of the mirror accounting variables

trondmy
2021-05-25T18:02:49Z

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