diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-10 19:34:30 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-10 19:34:30 -0500 |
| commit | a8fa94e0f2ab665f9aa665195618178b61ed8304 (patch) | |
| tree | 4060502fffd7f56d379372d517f8dcc31bf63955 /fs/ntfs/file.c | |
| parent | 9561a8961c708ff6ba3e71a817af0f16bdc1d885 (diff) | |
| parent | b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (diff) | |
| download | blackbird-op-linux-a8fa94e0f2ab665f9aa665195618178b61ed8304.tar.gz blackbird-op-linux-a8fa94e0f2ab665f9aa665195618178b61ed8304.zip | |
Merge branch 'master' into driver-core-next-test-merge-rc2
da9846ae1518 ("kernfs: make kernfs_deactivate() honor KERNFS_LOCKDEP
flag") in driver-core-linus conflicts with kernfs_drain() updates in
driver-core-next. The former just adds the missing KERNFS_LOCKDEP
checks which are already handled by kernfs_lockdep() checks in
driver-core-next. The conflict can be resolved by taking code from
driver-core-next.
Conflicts:
fs/kernfs/dir.c
Diffstat (limited to 'fs/ntfs/file.c')
| -rw-r--r-- | fs/ntfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index ea4ba9daeb47..db9bd8a31725 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c @@ -2134,7 +2134,7 @@ static ssize_t ntfs_file_aio_write(struct kiocb *iocb, const struct iovec *iov, ret = ntfs_file_aio_write_nolock(iocb, iov, nr_segs, &iocb->ki_pos); mutex_unlock(&inode->i_mutex); if (ret > 0) { - int err = generic_write_sync(file, pos, ret); + int err = generic_write_sync(file, iocb->ki_pos - ret, ret); if (err < 0) ret = err; } |
