summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2019-08-27 14:03:28 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-09-21 08:15:37 +0300
commitdee9ad44006842aa8e04b8895dba00a7035a5bad (patch)
treeb03847b905a5d8bdea97d7cc615adc0ca10de469 /fs
parentcb8b1858f25b87fd0d705822795fb6f7ef98b2ed (diff)
downloadlinux-dee9ad44006842aa8e04b8895dba00a7035a5bad.tar.xz
NFSv2: Fix write regression
[ Upstream commit d33d4beb522987d1c305c12500796f9be3687dee ] Ensure we update the write result count on success, since the RPC call itself does not do so. Reported-by: Jan Stancek <jstancek@redhat.com> Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> Tested-by: Jan Stancek <jstancek@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/proc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 73d1f7277e48..eff93315572e 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -611,8 +611,10 @@ static int nfs_proc_pgio_rpc_prepare(struct rpc_task *task,
static int nfs_write_done(struct rpc_task *task, struct nfs_pgio_header *hdr)
{
- if (task->tk_status >= 0)
+ if (task->tk_status >= 0) {
+ hdr->res.count = hdr->args.count;
nfs_writeback_update_inode(hdr);
+ }
return 0;
}