]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup
authorTrond Myklebust <trond.myklebust@hammerspace.com>
Wed, 14 Aug 2019 18:19:09 +0000 (14:19 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 21 Sep 2019 05:18:30 +0000 (07:18 +0200)
[ 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 <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/nfs/pagelist.c

index 8b6211753228939decffff1645e056d7250b6eae..eae584dbfa085b12f6268e7076c086fd188e2ec5 100644 (file)
@@ -590,7 +590,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);