aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/pagelist.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2021-05-25 11:26:35 -0400
committerTrond Myklebust <trond.myklebust@hammerspace.com>2021-05-26 06:36:13 -0400
commit70536bf4eb07ed5d2816ccb274e5e6b41b95a437 (patch)
treee29ee29e8eea3d947468aa96f91a7993c120cec1 /fs/nfs/pagelist.c
parentNFS: Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce() (diff)
downloadlinux-dev-70536bf4eb07ed5d2816ccb274e5e6b41b95a437.tar.xz
linux-dev-70536bf4eb07ed5d2816ccb274e5e6b41b95a437.zip
NFS: Clean up reset of the mirror accounting variables
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>
Diffstat (limited to 'fs/nfs/pagelist.c')
-rw-r--r--fs/nfs/pagelist.c9
1 files changed, 1 insertions, 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;