summaryrefslogtreecommitdiff
path: root/fs/nfs/write.c
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2018-01-18 14:17:13 -0700
committerBob Peterson <rpeterso@redhat.com>2018-01-18 14:17:13 -0700
commit786ebd9f68cdf512f389e5f2d0015f1beb0777d8 (patch)
treeb4bae82884c2232f891aec11e58b38eb4fec5e5d /fs/nfs/write.c
parent1f23bc7869fffec40b8bd9333a74a18d1de54d98 (diff)
parent4e56a6411fbce6f859566e17298114c2434391a4 (diff)
Merge branch 'punch-hole' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git
Diffstat (limited to 'fs/nfs/write.c')
-rw-r--r--fs/nfs/write.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 5b5f464f6f2a..4a379d7918f2 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1890,6 +1890,8 @@ int nfs_commit_inode(struct inode *inode, int how)
if (res)
error = nfs_generic_commit_list(inode, &head, how, &cinfo);
nfs_commit_end(cinfo.mds);
+ if (res == 0)
+ return res;
if (error < 0)
goto out_error;
if (!may_wait)