From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8AE6C3A5A6 for ; Thu, 19 Sep 2019 22:31:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80812208C0 for ; Thu, 19 Sep 2019 22:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568932266; bh=/4xlBmnfudmSTjpsJDyCd9N7vW70SiiLx4tcx9LYl+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=i+w/gO2Jfzn5vRffnzadzIsV9DtS0qtTQyaXQy532JRrFDEH/1qRLHZuGZ0Rt++mH XTXum8R3BDuSEzOMEVDJkq/JCJCmEImffawoZgXF2itq2IkK5QynEd6JL8b/co44BV vzeZ6iHL9Emig2xJq7QOFla+HQHfNlyx06o7Qg10= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406322AbfISWbF (ORCPT ); Thu, 19 Sep 2019 18:31:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:55092 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404088AbfISWPN (ORCPT ); Thu, 19 Sep 2019 18:15:13 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 185B92196F; Thu, 19 Sep 2019 22:15:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931312; bh=/4xlBmnfudmSTjpsJDyCd9N7vW70SiiLx4tcx9LYl+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vn2LTWs8ASLorXAkTcwTzy1H9v5gLLXLaKtCeNF6P1xLnZb7MJdbGzxTSBSnd5sUx z89TNmgl87Efvux5TzR/QhyTytbNpWhpG1tV7utxXYhMJXOEyto9OahAznPKMp1wmZ 9QywChfD27RwKEchJb6JfSQSfTQYj/zDrv5LUOqg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Sasha Levin Subject: [PATCH 4.19 38/79] NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup Date: Fri, 20 Sep 2019 00:03:23 +0200 Message-Id: <20190919214811.136697798@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214807.612593061@linuxfoundation.org> References: <20190919214807.612593061@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Trond Myklebust [ Upstream commit 17d8c5d145000070c581f2a8aa01edc7998582ab ] Initialise the result count to 0 rather than initialising it to the argument count. The reason is that we want to ensure we record the I/O stats correctly in the case where an error is returned (for instance in the layoutstats). Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/pagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index d23ea74b5d203..9cf59e2622f8e 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -567,7 +567,7 @@ static void nfs_pgio_rpcsetup(struct nfs_pgio_header *hdr, } hdr->res.fattr = &hdr->fattr; - hdr->res.count = count; + hdr->res.count = 0; hdr->res.eof = 0; hdr->res.verf = &hdr->verf; nfs_fattr_init(&hdr->fattr); -- 2.20.1