diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-02-11 20:58:20 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-04-01 23:19:35 -0400 |
| commit | 5cb6c6c7eb1ed24744b41fad47d9a25b72207098 (patch) | |
| tree | 14c8b8163c3491246412b0f23a4294f9fef5b222 /mm/filemap.c | |
| parent | 867c4f9329e1bf7d0967bec761f033373f72b55e (diff) | |
| download | linux-stable-5cb6c6c7eb1ed24744b41fad47d9a25b72207098.tar.gz linux-stable-5cb6c6c7eb1ed24744b41fad47d9a25b72207098.tar.bz2 linux-stable-5cb6c6c7eb1ed24744b41fad47d9a25b72207098.zip | |
generic_file_direct_write(): get rid of ppos argument
always equal to &iocb->ki_pos.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 9d515a1a2372..93e9cf576452 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1985,7 +1985,7 @@ EXPORT_SYMBOL(pagecache_write_end); ssize_t generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov, - unsigned long *nr_segs, loff_t pos, loff_t *ppos, + unsigned long *nr_segs, loff_t pos, size_t count, size_t ocount) { struct file *file = iocb->ki_filp; @@ -2046,7 +2046,7 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov, i_size_write(inode, pos); mark_inode_dirty(inode); } - *ppos = pos; + iocb->ki_pos = pos; } out: return written; @@ -2265,7 +2265,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov, ssize_t written_buffered; written = generic_file_direct_write(iocb, iov, &nr_segs, pos, - &iocb->ki_pos, count, ocount); + count, ocount); if (written < 0 || written == count) goto out; /* |