From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Fri, 26 Jun 2015 19:37:58 +0000 (-0400)
Subject: pNFS/flexfiles: Fix the reset of struct pgio_header when resending
X-Git-Tag: v4.1.4~27
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=48ac6c92fabea8eaf75d1f25255a502b1c354f48;p=users%2Fjedix%2Flinux-maple.git

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>
---

diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index 7d05089e52d6c..6f5f0f425e86b 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;
 	}