raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
commit 0d0ea30935 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: a7d42ddb30 ("nfs: add mirroring support to pgio layer")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Trond Myklebust
2021-05-25 10:40:12 -04:00
committed by Greg Kroah-Hartman
parent ee21cd3aa8
commit 7087db95c0
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/nfs/pagelist.c
View File

@@ -1128,17 +1128,16 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
{ {
struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc); struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
if (!list_empty(&mirror->pg_list)) { if (!list_empty(&mirror->pg_list)) {
int error = desc->pg_ops->pg_doio(desc); int error = desc->pg_ops->pg_doio(desc);
if (error < 0) if (error < 0)
desc->pg_error = error; desc->pg_error = error;
else if (list_empty(&mirror->pg_list)) {
mirror->pg_bytes_written += mirror->pg_count; mirror->pg_bytes_written += mirror->pg_count;
} mirror->pg_count = 0;
if (list_empty(&mirror->pg_list)) { mirror->pg_base = 0;
mirror->pg_count = 0; mirror->pg_recoalesce = 0;
mirror->pg_base = 0; }
} }
} }
@@ -1228,7 +1227,6 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)
do { do {
list_splice_init(&mirror->pg_list, &head); list_splice_init(&mirror->pg_list, &head);
mirror->pg_bytes_written -= mirror->pg_count;
mirror->pg_count = 0; mirror->pg_count = 0;
mirror->pg_base = 0; mirror->pg_base = 0;
mirror->pg_recoalesce = 0; mirror->pg_recoalesce = 0;