From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:41263 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754501AbbGaRsZ (ORCPT ); Fri, 31 Jul 2015 13:48:25 -0400 Subject: Patch "pNFS/flexfiles: Fix the reset of struct pgio_header when resending" has been added to the 4.1-stable tree To: trond.myklebust@primarydata.com, gregkh@linuxfoundation.org Cc: , From: Date: Fri, 31 Jul 2015 10:48:23 -0700 Message-ID: <1438364903245213@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled pNFS/flexfiles: Fix the reset of struct pgio_header when resending to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: pnfs-flexfiles-fix-the-reset-of-struct-pgio_header-when-resending.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From d620876990f02788d5a663075df007ffb91bdfad Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Fri, 26 Jun 2015 15:37:58 -0400 Subject: pNFS/flexfiles: Fix the reset of struct pgio_header when resending From: Trond Myklebust commit d620876990f02788d5a663075df007ffb91bdfad upstream. hdr->good_bytes needs to be set to the length of the request, not zero. Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- fs/nfs/flexfilelayout/flexfilelayout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -631,7 +631,7 @@ static void ff_layout_reset_write(struct 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; } Patches currently in stable-queue which might be from trond.myklebust@primarydata.com are queue-4.1/pnfs-flexfiles-fix-the-reset-of-struct-pgio_header-when-resending.patch queue-4.1/pnfs-fix-a-memory-leak-when-attempted-pnfs-fails.patch queue-4.1/nfs-fix-size-of-nfsacl-setacl-operations.patch