diff mbox series

[2/3] NFS: Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce()

Message ID 20210525153231.240329-2-trondmy@kernel.org (mailing list archive)
State New
Headers show
Series [1/3] NFS: Fix an Oopsable condition in __nfs_pageio_add_request() | expand

Commit Message

trondmy@kernel.org May 25, 2021, 3:32 p.m. UTC
From: Trond Myklebust <trond.myklebust@hammerspace.com>

The value of mirror->pg_bytes_written should only be updated after a
successful attempt to flush out the requests on the list.

Fixes: a7d42ddb3099 ("nfs: add mirroring support to pgio layer")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
 fs/nfs/pagelist.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 76869728c44e..a5d3e2a12ae9 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -1126,17 +1126,16 @@  static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
 {
 	struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
 
-
 	if (!list_empty(&mirror->pg_list)) {
 		int error = desc->pg_ops->pg_doio(desc);
 		if (error < 0)
 			desc->pg_error = error;
-		else
-			mirror->pg_bytes_written += mirror->pg_count;
 	}
 	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;
 	}
 }
 
@@ -1226,7 +1225,6 @@  static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)
 
 	do {
 		list_splice_init(&mirror->pg_list, &head);
-		mirror->pg_bytes_written -= mirror->pg_count;
 		mirror->pg_count = 0;
 		mirror->pg_base = 0;
 		mirror->pg_recoalesce = 0;