lose the redundant argument of __generic_file_aio_write() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/fs/block_dev.c b/fs/block_dev.c index 1e86823..764bd3b 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c
@@ -1518,7 +1518,7 @@ BUG_ON(iocb->ki_pos != pos); blk_start_plug(&plug); - ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos); + ret = __generic_file_aio_write(iocb, iov, nr_segs); if (ret > 0) { ssize_t err;
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 5a5a872..628aba4 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c
@@ -2551,8 +2551,7 @@ server->vals->exclusive_lock_type, NULL, CIFS_WRITE_OP)) { mutex_lock(&inode->i_mutex); - rc = __generic_file_aio_write(iocb, iov, nr_segs, - &iocb->ki_pos); + rc = __generic_file_aio_write(iocb, iov, nr_segs); mutex_unlock(&inode->i_mutex); }
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 3da2194..d68104a 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c
@@ -146,7 +146,7 @@ overwrite = 1; } - ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos); + ret = __generic_file_aio_write(iocb, iov, nr_segs); mutex_unlock(&inode->i_mutex); if (ret > 0) {
diff --git a/include/linux/fs.h b/include/linux/fs.h index 121f11f..417ea60 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h
@@ -2460,8 +2460,7 @@ extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size); int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk); extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t); -extern ssize_t __generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, - loff_t *); +extern ssize_t __generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long); extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t); extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *, unsigned long *, loff_t, loff_t *, size_t, size_t);
diff --git a/mm/filemap.c b/mm/filemap.c index b7749a9..ccdc3c8 100644 --- a/mm/filemap.c +++ b/mm/filemap.c
@@ -2417,7 +2417,6 @@ * @iocb: IO state structure (file, offset, etc.) * @iov: vector with data to write * @nr_segs: number of segments in the vector - * @ppos: position where to write * * This function does all the work needed for actually writing data to a * file. It does all basic checks, removes SUID from the file, updates @@ -2432,13 +2431,14 @@ * avoid syncing under i_mutex. */ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov, - unsigned long nr_segs, loff_t *ppos) + unsigned long nr_segs) { struct file *file = iocb->ki_filp; struct address_space * mapping = file->f_mapping; size_t ocount; /* original count */ size_t count; /* after file limit checks */ struct inode *inode = mapping->host; + loff_t *ppos = &iocb->ki_pos; loff_t pos; ssize_t written; ssize_t err; @@ -2549,7 +2549,7 @@ BUG_ON(iocb->ki_pos != pos); mutex_lock(&inode->i_mutex); - ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos); + ret = __generic_file_aio_write(iocb, iov, nr_segs); mutex_unlock(&inode->i_mutex); if (ret > 0) {