lkml.org 
[lkml]   [2024]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 103/437] ipc: convert to read/write iterators
    Date
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    ---
    ipc/mqueue.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    diff --git a/ipc/mqueue.c b/ipc/mqueue.c
    index 5eea4dc0509e..812b03cf4273 100644
    --- a/ipc/mqueue.c
    +++ b/ipc/mqueue.c
    @@ -632,10 +632,9 @@ static int mqueue_unlink(struct inode *dir, struct dentry *dentry)
    * that are interesting from user point of view and aren't accessible
    * through std routines)
    */
    -static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
    - size_t count, loff_t *off)
    +static ssize_t mqueue_read_file(struct kiocb *iocb, struct iov_iter *to)
    {
    - struct inode *inode = file_inode(filp);
    + struct inode *inode = file_inode(iocb->ki_filp);
    struct mqueue_inode_info *info = MQUEUE_I(inode);
    char buffer[FILENT_SIZE];
    ssize_t ret;
    @@ -652,8 +651,7 @@ static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
    spin_unlock(&info->lock);
    buffer[sizeof(buffer)-1] = '\0';

    - ret = simple_read_from_buffer(u_data, count, off, buffer,
    - strlen(buffer));
    + ret = simple_copy_to_iter(buffer, &iocb->ki_pos, strlen(buffer), to);
    if (ret <= 0)
    return ret;

    @@ -1663,7 +1661,7 @@ static const struct inode_operations mqueue_dir_inode_operations = {
    static const struct file_operations mqueue_file_operations = {
    .flush = mqueue_flush_file,
    .poll = mqueue_poll_file,
    - .read = mqueue_read_file,
    + .read_iter = mqueue_read_file,
    .llseek = default_llseek,
    };

    --
    2.43.0

    \
     
     \ /
      Last update: 2024-05-27 16:36    [W:2.194 / U:1.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site