From: Trond Myklebust Date: Wed, 14 Aug 2019 18:19:09 +0000 (-0400) Subject: NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7e536ef98334c111b4fdfd4633fa15d1ae2d0d43;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup [ 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 --- diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 8a2077408ab0..af1bb7353792 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -593,7 +593,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);