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 266/437] watchdog: gef_wdt: convert to read/write iterators
    Date
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    ---
    drivers/watchdog/gef_wdt.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
    index 6a1db1c783fa..c946fd169966 100644
    --- a/drivers/watchdog/gef_wdt.c
    +++ b/drivers/watchdog/gef_wdt.c
    @@ -132,9 +132,10 @@ static void gef_wdt_set_timeout(unsigned int timeout)
    }


    -static ssize_t gef_wdt_write(struct file *file, const char __user *data,
    - size_t len, loff_t *ppos)
    +static ssize_t gef_wdt_write(struct kiocb *iocb, struct iov_iter *from)
    {
    + size_t len = iov_iter_count(from);
    +
    if (len) {
    if (!nowayout) {
    size_t i;
    @@ -143,7 +144,7 @@ static ssize_t gef_wdt_write(struct file *file, const char __user *data,

    for (i = 0; i != len; i++) {
    char c;
    - if (get_user(c, data + i))
    + if (get_iter(c, from))
    return -EFAULT;
    if (c == 'V')
    expect_close = 42;
    @@ -246,7 +247,7 @@ static int gef_wdt_release(struct inode *inode, struct file *file)
    static const struct file_operations gef_wdt_fops = {
    .owner = THIS_MODULE,
    .llseek = no_llseek,
    - .write = gef_wdt_write,
    + .write_iter = gef_wdt_write,
    .unlocked_ioctl = gef_wdt_ioctl,
    .compat_ioctl = compat_ptr_ioctl,
    .open = gef_wdt_open,
    --
    2.43.0

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