5 files changed, 8 insertions, 10 deletions

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 09c7afe32e49..a798db5e5e39 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -978,8 +978,7 @@ retry_snap:
                  * can not run at the same time
                  */
                 written = generic_file_buffered_write(iocb, iov, nr_segs,
-                                                      pos, &iocb->ki_pos,
-                                                      count, 0);
+                                                      pos, count, 0);
                 mutex_unlock(&inode->i_mutex);
         }
 
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 51632c40e896..89099cce14fe 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2383,7 +2383,7 @@ relock:
         } else {
                 current->backing_dev_info = file->f_mapping->backing_dev_info;
                 written = generic_file_buffered_write(iocb, iov, nr_segs, *ppos,
-                                                      ppos, count, 0);
+                                                      count, 0);
                 current->backing_dev_info = NULL;
         }
 
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 64b48eade91d..175ce58fbfa3 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -738,7 +738,7 @@ xfs_file_buffered_aio_write(
 write_retry:
         trace_xfs_file_buffered_write(ip, count, iocb->ki_pos, 0);
         ret = generic_file_buffered_write(iocb, iovp, nr_segs,
-                        pos, &iocb->ki_pos, count, 0);
+                        pos, count, 0);
 
         /*
          * If we just got an ENOSPC, try to write back all dirty inodes to
diff --git a/include/linux/fs.h b/include/linux/fs.h
index e677d1e1189f..830e37420f5e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2397,7 +2397,7 @@ extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsi
 extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *,
                 unsigned long *, loff_t, loff_t *, size_t, size_t);
 extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
-                unsigned long, loff_t, loff_t *, size_t, ssize_t);
+                unsigned long, loff_t, size_t, ssize_t);
 extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
 extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
 extern int generic_segment_checks(const struct iovec *iov,
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:
 
 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;