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)
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 ce2246dd90de..9d515a1a2372 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2183,7 +2183,7 @@ again:
2183 2183
2184ssize_t 2184ssize_t
2185generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov, 2185generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
2186 unsigned long nr_segs, loff_t pos, loff_t *ppos, 2186 unsigned long nr_segs, loff_t pos,
2187 size_t count, ssize_t written) 2187 size_t count, ssize_t written)
2188{ 2188{
2189 struct file *file = iocb->ki_filp; 2189 struct file *file = iocb->ki_filp;
@@ -2195,7 +2195,7 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
2195 2195
2196 if (likely(status >= 0)) { 2196 if (likely(status >= 0)) {
2197 written += status; 2197 written += status;
2198 *ppos = pos + status; 2198 iocb->ki_pos = pos + status;
2199 } 2199 }
2200 2200
2201 return written ? written : status; 2201 return written ? written : status;
@@ -2275,8 +2275,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
2275 pos += written; 2275 pos += written;
2276 count -= written; 2276 count -= written;
2277 written_buffered = generic_file_buffered_write(iocb, iov, 2277 written_buffered = generic_file_buffered_write(iocb, iov,
2278 nr_segs, pos, &iocb->ki_pos, count, 2278 nr_segs, pos, count, written);
2279 written);
2280 /* 2279 /*
2281 * If generic_file_buffered_write() retuned a synchronous error 2280 * If generic_file_buffered_write() retuned a synchronous error
2282 * then we want to return the number of bytes which were 2281 * 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,
2309 } 2308 }
2310 } else { 2309 } else {
2311 written = generic_file_buffered_write(iocb, iov, nr_segs, 2310 written = generic_file_buffered_write(iocb, iov, nr_segs,
2312 pos, &iocb->ki_pos, count, written); 2311 pos, count, written);
2313 } 2312 }
2314out: 2313out:
2315 current->backing_dev_info = NULL; 2314 current->backing_dev_info = NULL;