]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
udf: convert file ops from aio_read/write to read/write_iter
authorDave Kleikamp <dave.kleikamp@oracle.com>
Tue, 15 Oct 2013 18:44:40 +0000 (13:44 -0500)
committerDave Kleikamp <dave.kleikamp@oracle.com>
Fri, 18 Oct 2013 15:56:52 +0000 (10:56 -0500)
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Acked-by: Jan Kara <jack@suse.cz>
fs/udf/file.c

index 523ed309570ac2b73f92608c1875224288a432f0..9985beecffcabbe5fd97680ef1902e55f3d02ee7 100644 (file)
@@ -133,8 +133,8 @@ const struct address_space_operations udf_adinicb_aops = {
        .direct_IO      = udf_adinicb_direct_IO,
 };
 
-static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
-                                 unsigned long nr_segs, loff_t ppos)
+static ssize_t udf_file_write_iter(struct kiocb *iocb, struct iov_iter *iter,
+                                  loff_t ppos)
 {
        ssize_t retval;
        struct file *file = iocb->ki_filp;
@@ -168,7 +168,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
        } else
                up_write(&iinfo->i_data_sem);
 
-       retval = generic_file_aio_write(iocb, iov, nr_segs, ppos);
+       retval = generic_file_write_iter(iocb, iter, ppos);
        if (retval > 0)
                mark_inode_dirty(inode);
 
@@ -242,12 +242,12 @@ static int udf_release_file(struct inode *inode, struct file *filp)
 
 const struct file_operations udf_file_operations = {
        .read                   = do_sync_read,
-       .aio_read               = generic_file_aio_read,
+       .read_iter              = generic_file_read_iter,
        .unlocked_ioctl         = udf_ioctl,
        .open                   = generic_file_open,
        .mmap                   = generic_file_mmap,
        .write                  = do_sync_write,
-       .aio_write              = udf_file_aio_write,
+       .write_iter             = udf_file_write_iter,
        .release                = udf_release_file,
        .fsync                  = generic_file_fsync,
        .splice_read            = generic_file_splice_read,