diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-08-14 14:19:09 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-09-21 07:18:30 +0200 |
| commit | 518c9d0158e06324f51845faccf58073f79be926 (patch) | |
| tree | 861c0ae43578769768375b676104e64248f27906 /fs | |
| parent | d29a04e98cdb2f17b64b51d5dcf5a6848e1ba2e5 (diff) | |
| download | linux-stable-518c9d0158e06324f51845faccf58073f79be926.tar.gz linux-stable-518c9d0158e06324f51845faccf58073f79be926.tar.bz2 linux-stable-518c9d0158e06324f51845faccf58073f79be926.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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 8b6211753228..eae584dbfa08 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -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); |