summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2019-08-14 14:19:09 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-09-21 07:16:56 +0200
commit767877deb25a30652ff9a57510aa9c0e8c133be1 (patch)
tree7a9378bf30337597749c25b615ece37284f0d8ee /fs
parent4ac4f4716fba119a16b6a3ebe6bf345b9a32258b (diff)
downloadlinux-stable-767877deb25a30652ff9a57510aa9c0e8c133be1.tar.gz
linux-stable-767877deb25a30652ff9a57510aa9c0e8c133be1.tar.bz2
linux-stable-767877deb25a30652ff9a57510aa9c0e8c133be1.zip
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 <trond.myklebust@hammerspace.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/pagelist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index d23ea74b5d20..9cf59e2622f8 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);