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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 18AAAC3A5A9 for ; Wed, 4 Sep 2019 16:08:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB61220820 for ; Wed, 4 Sep 2019 16:08:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567613297; bh=YCbJWmgXpHdId8qXx5vigkxw/6rPH3pPDrQo4IJ0zyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HoGROeZO+nsUrlkvSqzuqwRCbB/CvGbbPWH7BLEIN+NpHa1RiZ6z0J42iiCMfk3GA iP6Hh4XUwblDQfQnEnPKPNetf7yNFuInxxcpnfqZzXLfqWHmmuKEoe3r/80lHX22lT c9cVQqSCe2DS4SbRL5SMkRXld5ngskzU0ha0zMh8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733050AbfIDQBg (ORCPT ); Wed, 4 Sep 2019 12:01:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:37132 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733034AbfIDQBg (ORCPT ); Wed, 4 Sep 2019 12:01:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D1B0522DBF; Wed, 4 Sep 2019 16:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612895; bh=YCbJWmgXpHdId8qXx5vigkxw/6rPH3pPDrQo4IJ0zyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=toFMBRVOPaJ3Ev3rXjoSVgUXqSVuSMGDiseOf87eh+UYGM0tzRdkbHAnLiPTt2enA pq4EcEMRD3cH8sMlYZ06o5hJw9/pEq0MgqgaYptfdc6mqqnE+JfGuG026x9e7lVqIF tnXk+btFlyAV1Oko8Cp7hKIbG35WUq5nd/vU94m0= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Trond Myklebust , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 11/36] NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup Date: Wed, 4 Sep 2019 12:00:57 -0400 Message-Id: <20190904160122.4179-11-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904160122.4179-1-sashal@kernel.org> References: <20190904160122.4179-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@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 28b013d1d44ae..7367e9fa54d77 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -566,7 +566,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