summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-06-26 15:37:58 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-03 09:29:17 -0700
commit48ac6c92fabea8eaf75d1f25255a502b1c354f48 (patch)
tree36d020081f43a15e42aa82eb5f7e6ee6a6d4e0fa
parent759367b8eaa40930166671679a00f5ec97e2c5fa (diff)
downloadlinux-stable-48ac6c92fabea8eaf75d1f25255a502b1c354f48.tar.gz
linux-stable-48ac6c92fabea8eaf75d1f25255a502b1c354f48.tar.bz2
linux-stable-48ac6c92fabea8eaf75d1f25255a502b1c354f48.zip
pNFS/flexfiles: Fix the reset of struct pgio_header when resending
commit d620876990f02788d5a663075df007ffb91bdfad upstream. hdr->good_bytes needs to be set to the length of the request, not zero. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/nfs/flexfilelayout/flexfilelayout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index 7d05089e52d6..6f5f0f425e86 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -631,7 +631,7 @@ static void ff_layout_reset_write(struct nfs_pgio_header *hdr, bool retry_pnfs)
nfs_direct_set_resched_writes(hdr->dreq);
/* fake unstable write to let common nfs resend pages */
hdr->verf.committed = NFS_UNSTABLE;
- hdr->good_bytes = 0;
+ hdr->good_bytes = hdr->args.count;
}
return;
}