Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b291baae authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFS: Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce() 



commit 0d0ea309357dea0d85a82815f02157eb7fcda39f upstream.

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

Fixes: a7d42ddb ("nfs: add mirroring support to pgio layer")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b287521e

fs/nfs/pagelist.c

+5 −7
Original line number Diff line number Diff line
@@ -952,17 +952,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;

		}

	}

}
@@ -1061,7 +1060,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;