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 | |
parent | 867c4f9329e1bf7d0967bec761f033373f72b55e (diff) |
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')
-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); | |||
1985 | 1985 | ||
1986 | ssize_t | 1986 | ssize_t |
1987 | generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov, | 1987 | generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov, |
1988 | unsigned long *nr_segs, loff_t pos, loff_t *ppos, | 1988 | unsigned long *nr_segs, loff_t pos, |
1989 | size_t count, size_t ocount) | 1989 | size_t count, size_t ocount) |
1990 | { | 1990 | { |
1991 | struct file *file = iocb->ki_filp; | 1991 | struct file *file = iocb->ki_filp; |
@@ -2046,7 +2046,7 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov, | |||
2046 | i_size_write(inode, pos); | 2046 | i_size_write(inode, pos); |
2047 | mark_inode_dirty(inode); | 2047 | mark_inode_dirty(inode); |
2048 | } | 2048 | } |
2049 | *ppos = pos; | 2049 | iocb->ki_pos = pos; |
2050 | } | 2050 | } |
2051 | out: | 2051 | out: |
2052 | return written; | 2052 | return written; |
@@ -2265,7 +2265,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov, | |||
2265 | ssize_t written_buffered; | 2265 | ssize_t written_buffered; |
2266 | 2266 | ||
2267 | written = generic_file_direct_write(iocb, iov, &nr_segs, pos, | 2267 | written = generic_file_direct_write(iocb, iov, &nr_segs, pos, |
2268 | &iocb->ki_pos, count, ocount); | 2268 | count, ocount); |
2269 | if (written < 0 || written == count) | 2269 | if (written < 0 || written == count) |
2270 | goto out; | 2270 | goto out; |
2271 | /* | 2271 | /* |