]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
pNFS/flexfiles: Fix the reset of struct pgio_header when resending
authorTrond Myklebust <trond.myklebust@primarydata.com>
Fri, 26 Jun 2015 19:37:58 +0000 (15:37 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Aug 2015 16:29:17 +0000 (09:29 -0700)
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>
fs/nfs/flexfilelayout/flexfilelayout.c

index 7d05089e52d6c8b7a29e92e80011bdee0e06a32c..6f5f0f425e86bba5335679d6690c7dca1c885862 100644 (file)
@@ -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;
        }