summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-02-11 20:58:20 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-04-01 23:19:35 -0400
commit5cb6c6c7eb1ed24744b41fad47d9a25b72207098 (patch)
tree14c8b8163c3491246412b0f23a4294f9fef5b222 /mm
parent867c4f9329e1bf7d0967bec761f033373f72b55e (diff)
downloadlinux-0-day-5cb6c6c7eb1ed24744b41fad47d9a25b72207098.tar.gz
linux-0-day-5cb6c6c7eb1ed24744b41fad47d9a25b72207098.tar.xz
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 9d515a1a23721..93e9cf576452c 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;
/*