From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751124AbWEJQAd (ORCPT ); Wed, 10 May 2006 12:00:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751393AbWEJQAd (ORCPT ); Wed, 10 May 2006 12:00:33 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:55697 "EHLO e33.co.us.ibm.com") by vger.kernel.org with ESMTP id S1751124AbWEJQAc (ORCPT ); Wed, 10 May 2006 12:00:32 -0400 Subject: Re: [PATCH 1/3] Vectorize aio_read/aio_write methods From: Badari Pulavarty To: Christoph Hellwig Cc: Andrew Morton , lkml , Benjamin LaHaise , cel@citi.umich.edu In-Reply-To: <20060509192051.GA19378@lst.de> References: <1146582438.8373.7.camel@dyn9047017100.beaverton.ibm.com> <1147197826.27056.4.camel@dyn9047017100.beaverton.ibm.com> <1147198025.28388.0.camel@dyn9047017100.beaverton.ibm.com> <20060509120105.7255e265.akpm@osdl.org> <20060509190310.GA19124@lst.de> <20060509121305.0840e770.akpm@osdl.org> <20060509192051.GA19378@lst.de> Content-Type: text/plain Date: Wed, 10 May 2006 09:01:41 -0700 Message-Id: <1147276901.4016.15.camel@dyn9047017100.beaverton.ibm.com> Mime-Version: 1.0 X-Mailer: Evolution 2.0.4 (2.0.4-4) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org I am starting to like this :) Here is what I have so far (this patch applies on top of the other set). We will NOW have only up following: generic_file_aio_read() - read handler generic_file_aio_write() - write handler generic_file_aio_write_nolock() - no lock write handler __generic_file_aio_write_nolock() - internal worker routine (not exported) Thanks, Badari Get rid of everything other than following generic read/write interfaces: generic_file_aio_read() - read handler generic_file_aio_write() - write handler generic_file_aio_write_nolock() - no lock write handler __generic_file_aio_write_nolock() - internal worker routine (not exported) Signed-off-by: Badari Pulavarty drivers/char/raw.c | 15 +------ fs/adfs/file.c | 6 ++- fs/affs/file.c | 6 ++- fs/bfs/file.c | 6 ++- fs/block_dev.c | 12 +----- fs/ext2/file.c | 4 +- fs/fuse/file.c | 6 ++- fs/hfs/inode.c | 6 ++- fs/hfsplus/inode.c | 6 ++- fs/hostfs/hostfs_kern.c | 4 +- fs/hpfs/file.c | 6 ++- fs/jffs/inode-v23.c | 6 ++- fs/jffs2/file.c | 6 ++- fs/jfs/file.c | 4 +- fs/minix/file.c | 6 ++- fs/ntfs/file.c | 2 - fs/qnx4/file.c | 6 ++- fs/ramfs/file-mmu.c | 6 ++- fs/ramfs/file-nommu.c | 6 ++- fs/read_write.c | 3 + fs/xfs/linux-2.6/xfs_lrw.c | 4 +- include/linux/fs.h | 5 -- mm/filemap.c | 88 ++------------------------------------------- 23 files changed, 72 insertions(+), 147 deletions(-) Index: linux-2.6.17-rc3.save/drivers/char/raw.c =================================================================== --- linux-2.6.17-rc3.save.orig/drivers/char/raw.c 2006-05-10 08:23:47.000000000 -0700 +++ linux-2.6.17-rc3.save/drivers/char/raw.c 2006-05-10 08:29:35.000000000 -0700 @@ -239,21 +239,10 @@ out: return err; } -static ssize_t raw_file_write(struct file *file, const char __user *buf, - size_t count, loff_t *ppos) -{ - struct iovec local_iov = { - .iov_base = (char __user *)buf, - .iov_len = count - }; - - return generic_file_write_nolock(file, &local_iov, 1, ppos); -} - static struct file_operations raw_fops = { - .read = generic_file_read, + .read = do_sync_read, .aio_read = generic_file_aio_read, - .write = raw_file_write, + .write = do_sync_write, .aio_write = generic_file_aio_write_nolock, .open = raw_open, .release= raw_release, Index: linux-2.6.17-rc3.save/fs/adfs/file.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/adfs/file.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/adfs/file.c 2006-05-10 08:29:35.000000000 -0700 @@ -27,10 +27,12 @@ const struct file_operations adfs_file_operations = { .llseek = generic_file_llseek, - .read = generic_file_read, + .read = do_sync_read, + .aio_read = generic_file_aio_read, .mmap = generic_file_mmap, .fsync = file_fsync, - .write = generic_file_write, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .sendfile = generic_file_sendfile, }; Index: linux-2.6.17-rc3.save/fs/affs/file.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/affs/file.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/affs/file.c 2006-05-10 08:29:35.000000000 -0700 @@ -27,8 +27,10 @@ static int affs_file_release(struct inod const struct file_operations affs_file_operations = { .llseek = generic_file_llseek, - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .aio_read = generic_file_aio_read, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .open = affs_file_open, .release = affs_file_release, Index: linux-2.6.17-rc3.save/fs/bfs/file.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/bfs/file.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/bfs/file.c 2006-05-10 08:29:35.000000000 -0700 @@ -19,8 +19,10 @@ const struct file_operations bfs_file_operations = { .llseek = generic_file_llseek, - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .aio_read = generic_file_aio_read, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .sendfile = generic_file_sendfile, }; Index: linux-2.6.17-rc3.save/fs/block_dev.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/block_dev.c 2006-05-10 08:23:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/block_dev.c 2006-05-10 08:29:35.000000000 -0700 @@ -1056,14 +1056,6 @@ static int blkdev_close(struct inode * i return blkdev_put(bdev); } -static ssize_t blkdev_file_write(struct file *file, const char __user *buf, - size_t count, loff_t *ppos) -{ - struct iovec local_iov = { .iov_base = (void __user *)buf, .iov_len = count }; - - return generic_file_write_nolock(file, &local_iov, 1, ppos); -} - static long block_ioctl(struct file *file, unsigned cmd, unsigned long arg) { return blkdev_ioctl(file->f_mapping->host, file, cmd, arg); @@ -1083,8 +1075,8 @@ const struct file_operations def_blk_fop .open = blkdev_open, .release = blkdev_close, .llseek = block_llseek, - .read = generic_file_read, - .write = blkdev_file_write, + .read = do_sync_read, + .write = do_sync_write, .aio_read = generic_file_aio_read, .aio_write = generic_file_aio_write_nolock, .mmap = generic_file_mmap, Index: linux-2.6.17-rc3.save/fs/ext2/file.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/ext2/file.c 2006-05-10 08:23:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/ext2/file.c 2006-05-10 08:29:35.000000000 -0700 @@ -41,8 +41,8 @@ static int ext2_release_file (struct ino */ const struct file_operations ext2_file_operations = { .llseek = generic_file_llseek, - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .write = do_sync_write, .aio_read = generic_file_aio_read, .aio_write = generic_file_aio_write, .ioctl = ext2_ioctl, Index: linux-2.6.17-rc3.save/fs/fuse/file.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/fuse/file.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/fuse/file.c 2006-05-10 08:29:35.000000000 -0700 @@ -621,8 +621,10 @@ static int fuse_set_page_dirty(struct pa static const struct file_operations fuse_file_operations = { .llseek = generic_file_llseek, - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .aio_read = generic_file_aio_read, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .mmap = fuse_file_mmap, .open = fuse_open, .flush = fuse_flush, Index: linux-2.6.17-rc3.save/fs/hfs/inode.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/hfs/inode.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/hfs/inode.c 2006-05-10 08:29:35.000000000 -0700 @@ -603,8 +603,10 @@ int hfs_inode_setattr(struct dentry *den static const struct file_operations hfs_file_operations = { .llseek = generic_file_llseek, - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .aio_read = generic_file_aio_read, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .sendfile = generic_file_sendfile, .fsync = file_fsync, Index: linux-2.6.17-rc3.save/fs/hfsplus/inode.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/hfsplus/inode.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/hfsplus/inode.c 2006-05-10 08:29:35.000000000 -0700 @@ -282,8 +282,10 @@ static struct inode_operations hfsplus_f static const struct file_operations hfsplus_file_operations = { .llseek = generic_file_llseek, - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .aio_read = generic_file_aio_read, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .sendfile = generic_file_sendfile, .fsync = file_fsync, Index: linux-2.6.17-rc3.save/fs/hostfs/hostfs_kern.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/hostfs/hostfs_kern.c 2006-05-10 08:23:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/hostfs/hostfs_kern.c 2006-05-10 08:29:35.000000000 -0700 @@ -386,11 +386,11 @@ int hostfs_fsync(struct file *file, stru static const struct file_operations hostfs_file_fops = { .llseek = generic_file_llseek, - .read = generic_file_read, + .read = do_sync_read, .sendfile = generic_file_sendfile, .aio_read = generic_file_aio_read, .aio_write = generic_file_aio_write, - .write = generic_file_write, + .write = do_sync_write, .mmap = generic_file_mmap, .open = hostfs_file_open, .release = NULL, Index: linux-2.6.17-rc3.save/fs/hpfs/file.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/hpfs/file.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/hpfs/file.c 2006-05-10 08:29:35.000000000 -0700 @@ -113,7 +113,7 @@ static ssize_t hpfs_file_write(struct fi { ssize_t retval; - retval = generic_file_write(file, buf, count, ppos); + retval = do_sync_write(file, buf, count, ppos); if (retval > 0) hpfs_i(file->f_dentry->d_inode)->i_dirty = 1; return retval; @@ -122,8 +122,10 @@ static ssize_t hpfs_file_write(struct fi const struct file_operations hpfs_file_ops = { .llseek = generic_file_llseek, - .read = generic_file_read, + .read = do_sync_read, + .aio_read = generic_file_aio_read, .write = hpfs_file_write, + .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .release = hpfs_file_release, .fsync = hpfs_file_fsync, Index: linux-2.6.17-rc3.save/fs/jffs/inode-v23.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/jffs/inode-v23.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/jffs/inode-v23.c 2006-05-10 08:29:35.000000000 -0700 @@ -1633,8 +1633,10 @@ static const struct file_operations jffs { .open = generic_file_open, .llseek = generic_file_llseek, - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .aio_read = generic_file_aio_read, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .ioctl = jffs_ioctl, .mmap = generic_file_readonly_mmap, .fsync = jffs_fsync, Index: linux-2.6.17-rc3.save/fs/jffs2/file.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/jffs2/file.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/jffs2/file.c 2006-05-10 08:29:35.000000000 -0700 @@ -42,8 +42,10 @@ const struct file_operations jffs2_file_ { .llseek = generic_file_llseek, .open = generic_file_open, - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .aio_read = generic_file_aio_read, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .ioctl = jffs2_ioctl, .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, Index: linux-2.6.17-rc3.save/fs/jfs/file.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/jfs/file.c 2006-05-10 08:23:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/jfs/file.c 2006-05-10 08:29:35.000000000 -0700 @@ -103,8 +103,8 @@ struct inode_operations jfs_file_inode_o const struct file_operations jfs_file_operations = { .open = jfs_open, .llseek = generic_file_llseek, - .write = generic_file_write, - .read = generic_file_read, + .write = do_sync_write, + .read = do_sync_read, .aio_read = generic_file_aio_read, .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, Index: linux-2.6.17-rc3.save/fs/minix/file.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/minix/file.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/minix/file.c 2006-05-10 08:29:35.000000000 -0700 @@ -17,8 +17,10 @@ int minix_sync_file(struct file *, struc const struct file_operations minix_file_operations = { .llseek = generic_file_llseek, - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .aio_read = generic_file_aio_read, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .fsync = minix_sync_file, .sendfile = generic_file_sendfile, Index: linux-2.6.17-rc3.save/fs/ntfs/file.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/ntfs/file.c 2006-05-10 08:23:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/ntfs/file.c 2006-05-10 08:29:35.000000000 -0700 @@ -2294,7 +2294,7 @@ static int ntfs_file_fsync(struct file * const struct file_operations ntfs_file_ops = { .llseek = generic_file_llseek, /* Seek inside file. */ - .read = generic_file_read, /* Read from file. */ + .read = do_sync_read, /* Read from file. */ .aio_read = generic_file_aio_read, /* Async read from file. */ #ifdef NTFS_RW .write = ntfs_file_write, /* Write to file. */ Index: linux-2.6.17-rc3.save/fs/qnx4/file.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/qnx4/file.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/qnx4/file.c 2006-05-10 08:29:35.000000000 -0700 @@ -22,11 +22,13 @@ const struct file_operations qnx4_file_operations = { .llseek = generic_file_llseek, - .read = generic_file_read, + .read = do_sync_read, + .aio_read = generic_file_aio_read, .mmap = generic_file_mmap, .sendfile = generic_file_sendfile, #ifdef CONFIG_QNX4FS_RW - .write = generic_file_write, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .fsync = qnx4_sync_file, #endif }; Index: linux-2.6.17-rc3.save/fs/ramfs/file-mmu.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/ramfs/file-mmu.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/ramfs/file-mmu.c 2006-05-10 08:29:35.000000000 -0700 @@ -33,8 +33,10 @@ struct address_space_operations ramfs_ao }; const struct file_operations ramfs_file_operations = { - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .aio_read = generic_file_aio_read, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .fsync = simple_sync_file, .sendfile = generic_file_sendfile, Index: linux-2.6.17-rc3.save/fs/ramfs/file-nommu.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/ramfs/file-nommu.c 2006-05-10 08:21:47.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/ramfs/file-nommu.c 2006-05-10 08:29:35.000000000 -0700 @@ -36,8 +36,10 @@ struct address_space_operations ramfs_ao const struct file_operations ramfs_file_operations = { .mmap = ramfs_nommu_mmap, .get_unmapped_area = ramfs_nommu_get_unmapped_area, - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .aio_read = generic_file_aio_read, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .fsync = simple_sync_file, .sendfile = generic_file_sendfile, .llseek = generic_file_llseek, Index: linux-2.6.17-rc3.save/fs/read_write.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/read_write.c 2006-05-10 08:29:26.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/read_write.c 2006-05-10 08:29:35.000000000 -0700 @@ -22,7 +22,8 @@ const struct file_operations generic_ro_fops = { .llseek = generic_file_llseek, - .read = generic_file_read, + .read = do_sync_read, + .aio_read = generic_file_aio_read, .mmap = generic_file_readonly_mmap, .sendfile = generic_file_sendfile, }; Index: linux-2.6.17-rc3.save/include/linux/fs.h =================================================================== --- linux-2.6.17-rc3.save.orig/include/linux/fs.h 2006-05-10 08:29:26.000000000 -0700 +++ linux-2.6.17-rc3.save/include/linux/fs.h 2006-05-10 09:00:37.000000000 -0700 @@ -1594,11 +1594,8 @@ extern int generic_file_mmap(struct file extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *); extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size); extern int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size); -extern ssize_t generic_file_read(struct file *, char __user *, size_t, loff_t *); int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk); -extern ssize_t generic_file_write(struct file *, const char __user *, size_t, loff_t *); extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t); -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_nolock(struct kiocb *, const struct iovec *, unsigned long, loff_t); @@ -1608,8 +1605,6 @@ extern ssize_t generic_file_buffered_wri unsigned long, loff_t, 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); -ssize_t generic_file_write_nolock(struct file *file, const struct iovec *iov, - unsigned long nr_segs, loff_t *ppos); extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *); extern void do_generic_mapping_read(struct address_space *mapping, struct file_ra_state *, struct file *, Index: linux-2.6.17-rc3.save/mm/filemap.c =================================================================== --- linux-2.6.17-rc3.save.orig/mm/filemap.c 2006-05-10 08:23:47.000000000 -0700 +++ linux-2.6.17-rc3.save/mm/filemap.c 2006-05-10 08:44:01.000000000 -0700 @@ -1018,13 +1018,14 @@ success: * that can use the page cache directly. */ ssize_t -__generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov, - unsigned long nr_segs, loff_t *ppos) +generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov, + unsigned long nr_segs, loff_t pos) { struct file *filp = iocb->ki_filp; ssize_t retval; unsigned long seg; size_t count; + loff_t *ppos = &iocb->ki_pos; count = 0; for (seg = 0; seg < nr_segs; seg++) { @@ -1048,7 +1049,7 @@ __generic_file_aio_read(struct kiocb *io /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */ if (filp->f_flags & O_DIRECT) { - loff_t pos = *ppos, size; + loff_t size; struct address_space *mapping; struct inode *inode; @@ -1093,33 +1094,8 @@ out: return retval; } -EXPORT_SYMBOL(__generic_file_aio_read); - -ssize_t -generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov, - unsigned long nr_segs, loff_t pos) -{ - BUG_ON(iocb->ki_pos != pos); - return __generic_file_aio_read(iocb, iov, nr_segs, &iocb->ki_pos); -} EXPORT_SYMBOL(generic_file_aio_read); -ssize_t -generic_file_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos) -{ - struct iovec local_iov = { .iov_base = buf, .iov_len = count }; - struct kiocb kiocb; - ssize_t ret; - - init_sync_kiocb(&kiocb, filp); - ret = __generic_file_aio_read(&kiocb, &local_iov, 1, ppos); - if (-EIOCBQUEUED == ret) - ret = wait_on_sync_kiocb(&kiocb); - return ret; -} - -EXPORT_SYMBOL(generic_file_read); - int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size) { ssize_t written; @@ -2185,38 +2161,6 @@ ssize_t generic_file_aio_write_nolock(st } EXPORT_SYMBOL(generic_file_aio_write_nolock); -static ssize_t -__generic_file_write_nolock(struct file *file, const struct iovec *iov, - unsigned long nr_segs, loff_t *ppos) -{ - struct kiocb kiocb; - ssize_t ret; - - init_sync_kiocb(&kiocb, file); - kiocb.ki_pos = *ppos; - ret = __generic_file_aio_write_nolock(&kiocb, iov, nr_segs, ppos); - if (-EIOCBQUEUED == ret) - ret = wait_on_sync_kiocb(&kiocb); - return ret; -} - -ssize_t -generic_file_write_nolock(struct file *file, const struct iovec *iov, - unsigned long nr_segs, loff_t *ppos) -{ - struct kiocb kiocb; - ssize_t ret; - - init_sync_kiocb(&kiocb, file); - kiocb.ki_pos = *ppos; - ret = generic_file_aio_write_nolock(&kiocb, iov, nr_segs, *ppos); - if (-EIOCBQUEUED == ret) - ret = wait_on_sync_kiocb(&kiocb); - *ppos = kiocb.ki_pos; - return ret; -} -EXPORT_SYMBOL(generic_file_write_nolock); - ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos) { @@ -2242,30 +2186,6 @@ ssize_t generic_file_aio_write(struct ki } EXPORT_SYMBOL(generic_file_aio_write); -ssize_t generic_file_write(struct file *file, const char __user *buf, - size_t count, loff_t *ppos) -{ - struct address_space *mapping = file->f_mapping; - struct inode *inode = mapping->host; - ssize_t ret; - struct iovec local_iov = { .iov_base = (void __user *)buf, - .iov_len = count }; - - mutex_lock(&inode->i_mutex); - ret = __generic_file_write_nolock(file, &local_iov, 1, ppos); - mutex_unlock(&inode->i_mutex); - - if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) { - ssize_t err; - - err = sync_page_range(inode, mapping, *ppos - ret, ret); - if (err < 0) - ret = err; - } - return ret; -} -EXPORT_SYMBOL(generic_file_write); - /* * Called under i_mutex for writes to S_ISREG files. Returns -EIO if something * went wrong during pagecache shootdown. Index: linux-2.6.17-rc3.save/fs/xfs/linux-2.6/xfs_lrw.c =================================================================== --- linux-2.6.17-rc3.save.orig/fs/xfs/linux-2.6/xfs_lrw.c 2006-04-26 19:19:25.000000000 -0700 +++ linux-2.6.17-rc3.save/fs/xfs/linux-2.6/xfs_lrw.c 2006-05-10 08:45:52.000000000 -0700 @@ -276,7 +276,9 @@ xfs_read( xfs_rw_enter_trace(XFS_READ_ENTER, &ip->i_iocore, (void *)iovp, segs, *offset, ioflags); - ret = __generic_file_aio_read(iocb, iovp, segs, offset); + + iocb->ki_pos = *offset; + ret = generic_file_aio_read(iocb, iovp, segs, *offset); if (ret == -EIOCBQUEUED && !(ioflags & IO_ISAIO)) ret = wait_on_sync_kiocb(iocb); if (ret > 0)