]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
NFS: Clean up reset of the mirror accounting variables
authorTrond Myklebust <trond.myklebust@hammerspace.com>
Tue, 25 May 2021 15:26:35 +0000 (11:26 -0400)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Wed, 26 May 2021 10:36:13 +0000 (06:36 -0400)
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

index daf6658517f435577d930f839ea9e717988c7d05..cf9cc62ec48ec32a29aa3ebc8f79a86fe24a8c29 100644 (file)
@@ -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;