mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
NFS: Don't corrupt the value of pg_bytes_written in nfs_do_recoalesce()
commit0d0ea30935
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:
parent
1fc5f4eb9d
commit
785917316b
1 changed files with 5 additions and 7 deletions
|
@ -1019,17 +1019,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
|
||||
if (list_empty(&mirror->pg_list)) {
|
||||
mirror->pg_bytes_written += mirror->pg_count;
|
||||
}
|
||||
if (list_empty(&mirror->pg_list)) {
|
||||
mirror->pg_count = 0;
|
||||
mirror->pg_base = 0;
|
||||
mirror->pg_count = 0;
|
||||
mirror->pg_base = 0;
|
||||
mirror->pg_recoalesce = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1123,7 +1122,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;
|
||||
|
|
Loading…
Reference in a new issue