summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-02-09 13:37:49 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-04-01 23:19:34 -0400
commitfcacafd269adc88f41b68cb77a3f957a66563428 (patch)
tree5c2796dae6d890aad1ab1b4dc90f46ef53954a3a /mm
parent41fc56d573c35a212688b12b48af8c303f9bb6d2 (diff)
downloadop-kernel-dev-fcacafd269adc88f41b68cb77a3f957a66563428.zip
op-kernel-dev-fcacafd269adc88f41b68cb77a3f957a66563428.tar.gz
kill the 5th argument of generic_file_buffered_write()
same story - it's &iocb->ki_pos in all cases Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
-rw-r--r--mm/filemap.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index ce2246d..9d515a1 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2183,7 +2183,7 @@ again:
ssize_t
generic_file_buffered_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, ssize_t written)
{
struct file *file = iocb->ki_filp;
@@ -2195,7 +2195,7 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
if (likely(status >= 0)) {
written += status;
- *ppos = pos + status;
+ iocb->ki_pos = pos + status;
}
return written ? written : status;
@@ -2275,8 +2275,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
pos += written;
count -= written;
written_buffered = generic_file_buffered_write(iocb, iov,
- nr_segs, pos, &iocb->ki_pos, count,
- written);
+ nr_segs, pos, count, written);
/*
* If generic_file_buffered_write() retuned a synchronous error
* then we want to return the number of bytes which were
@@ -2309,7 +2308,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
}
} else {
written = generic_file_buffered_write(iocb, iov, nr_segs,
- pos, &iocb->ki_pos, count, written);
+ pos, count, written);
}
out:
current->backing_dev_info = NULL;
OpenPOWER on IntegriCloud