diff options
| author |   Tejun Heo <tj@kernel.org> | 2014-03-07 10:23:57 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-03-07 10:23:57 -0500 |
| commit | 5078585a18c8cb7d1b6b7744fce842dadb3b7c72 (patch) | |
| tree | 0c3d8a25acd4b34f0d460bd9ef6173f72ec2ade2 /mm/filemap.c | |
| parent | Merge branch 'wq/for-3.14-fixes' into wq/for-3.15 (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | wireguard-linux-5078585a18c8cb7d1b6b7744fce842dadb3b7c72.tar.xz wireguard-linux-5078585a18c8cb7d1b6b7744fce842dadb3b7c72.zip | |
Merge branch 'master' into wq/for-3.15
Pull 3.14-rc5 into wq/for-3.15 to receive nvme updates which the
scheduled PREPARE_DELAYED_WORK() updates depend on.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index d56d3c145b9f..7a13f6ac5421 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2553,8 +2553,8 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov, if (ret > 0) { ssize_t err; - err = generic_write_sync(file, pos, ret); - if (err < 0 && ret > 0) + err = generic_write_sync(file, iocb->ki_pos - ret, ret); + if (err < 0) ret = err; } return ret; |