The patch titled Vectorize aio interfaces to hypfs to fit new vfs ops interfaces has been added to the -mm tree. Its filename is vectorize-aio_read-aio_write-fileop-methods-hypfs-fix.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Vectorize aio interfaces to hypfs to fit new vfs ops interfaces From: Badari Pulavarty <pbadari@xxxxxxxxxx> Signed-off-by: Badari Pulavarty <pbadari@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/s390/hypfs/inode.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff -puN arch/s390/hypfs/inode.c~vectorize-aio_read-aio_write-fileop-methods-hypfs-fix arch/s390/hypfs/inode.c --- a/arch/s390/hypfs/inode.c~vectorize-aio_read-aio_write-fileop-methods-hypfs-fix +++ a/arch/s390/hypfs/inode.c @@ -134,12 +134,20 @@ static int hypfs_open(struct inode *inod return 0; } -static ssize_t hypfs_aio_read(struct kiocb *iocb, __user char *buf, - size_t count, loff_t offset) +static ssize_t hypfs_aio_read(struct kiocb *iocb, const struct iovec *iov, + unsigned long nr_segs, loff_t offset) { char *data; size_t len; struct file *filp = iocb->ki_filp; + /* XXX: temporary */ + char __user *buf = iov[0].iov_base; + size_t count = iov[0].iov_len; + + if (nr_segs != 1) { + count = -EINVAL; + goto out; + } data = filp->private_data; len = strlen(data); @@ -158,12 +166,13 @@ static ssize_t hypfs_aio_read(struct kio out: return count; } -static ssize_t hypfs_aio_write(struct kiocb *iocb, const char __user *buf, - size_t count, loff_t pos) +static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov, + unsigned long nr_segs, loff_t offset) { int rc; struct super_block *sb; struct hypfs_sb_info *fs_info; + size_t count = iov_length(iov, nr_segs); sb = iocb->ki_filp->f_dentry->d_inode->i_sb; fs_info = sb->s_fs_info; _ Patches currently in -mm which might be from pbadari@xxxxxxxxxx are vectorize-aio_read-aio_write-fileop-methods.patch vectorize-aio_read-aio_write-fileop-methods-xfs-fix.patch vectorize-aio_read-aio_write-fileop-methods-hypfs-fix.patch remove-readv-writev-methods-and-use-aio_read-aio_write.patch streamline-generic_file_-interfaces-and-filemap.patch streamline-generic_file_-interfaces-and-filemap-ecryptfs.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html