diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-09-20 16:58:59 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-09-20 16:58:59 +0200 |
commit | 41a66072c32978ff3914fd6be88f7592ef64bef7 (patch) | |
tree | 0f38ef433f0feea3e58f61f8d5397cd9bf065559 /fs/nfs/file.c | |
parent | 5465fe0fc3316f7cdda66732a7986f4ebe76d949 (diff) | |
parent | 7597cdc066313bfd211cca2f9252dfeb41271391 (diff) |
Merge branch 'efi/urgent' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r-- | fs/nfs/file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 7d620970f2e1..ca699ddc11c1 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -657,7 +657,10 @@ ssize_t nfs_file_write(struct kiocb *iocb, struct iov_iter *from) if (result <= 0) goto out; - written = generic_write_sync(iocb, result); + result = generic_write_sync(iocb, result); + if (result < 0) + goto out; + written = result; iocb->ki_pos += written; /* Return error values */ |