lkml.org 
[lkml]   [2013]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V6 26/30] gfs2: Convert aio_read/write ops to read/write_iter
    Date
    Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
    Cc: Steven Whitehouse <swhiteho@redhat.com>
    Cc: cluster-devel@redhat.com
    ---
    fs/gfs2/file.c | 21 ++++++++++-----------
    1 file changed, 10 insertions(+), 11 deletions(-)

    diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
    index 991ab2d..63af1a6 100644
    --- a/fs/gfs2/file.c
    +++ b/fs/gfs2/file.c
    @@ -655,10 +655,9 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end,
    }

    /**
    - * gfs2_file_aio_write - Perform a write to a file
    + * gfs2_file_write_iter - Perform a write to a file
    * @iocb: The io context
    - * @iov: The data to write
    - * @nr_segs: Number of @iov segments
    + * @iter: The data to write
    * @pos: The file position
    *
    * We have to do a lock/unlock here to refresh the inode size for
    @@ -668,11 +667,11 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end,
    *
    */

    -static ssize_t gfs2_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
    - unsigned long nr_segs, loff_t pos)
    +static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *iter,
    + loff_t pos)
    {
    struct file *file = iocb->ki_filp;
    - size_t writesize = iov_length(iov, nr_segs);
    + size_t writesize = iov_iter_count(iter);
    struct dentry *dentry = file->f_dentry;
    struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
    int ret;
    @@ -692,7 +691,7 @@ static ssize_t gfs2_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
    gfs2_glock_dq_uninit(&gh);
    }

    - return generic_file_aio_write(iocb, iov, nr_segs, pos);
    + return generic_file_write_iter(iocb, iter, pos);
    }

    static int fallocate_chunk(struct inode *inode, loff_t offset, loff_t len,
    @@ -1021,9 +1020,9 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
    const struct file_operations gfs2_file_fops = {
    .llseek = gfs2_llseek,
    .read = do_sync_read,
    - .aio_read = generic_file_aio_read,
    + .read_iter = generic_file_read_iter,
    .write = do_sync_write,
    - .aio_write = gfs2_file_aio_write,
    + .write_iter = gfs2_file_write_iter,
    .unlocked_ioctl = gfs2_ioctl,
    .mmap = gfs2_mmap,
    .open = gfs2_open,
    @@ -1053,9 +1052,9 @@ const struct file_operations gfs2_dir_fops = {
    const struct file_operations gfs2_file_fops_nolock = {
    .llseek = gfs2_llseek,
    .read = do_sync_read,
    - .aio_read = generic_file_aio_read,
    + .read_iter = generic_file_read_iter,
    .write = do_sync_write,
    - .aio_write = gfs2_file_aio_write,
    + .write_iter = gfs2_file_write_iter,
    .unlocked_ioctl = gfs2_ioctl,
    .mmap = gfs2_mmap,
    .open = gfs2_open,
    --
    1.8.1.1


    \
     
     \ /
      Last update: 2013-01-29 20:22    [W:3.421 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site