lkml.org 
[lkml]   [2019]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 095/111] loop: Fold __loop_release into loop_release
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jan Kara <jack@suse.cz>

    commit 967d1dc144b50ad005e5eecdfadfbcfb399ffff6 upstream.

    __loop_release() has a single call site. Fold it there. This is
    currently not a huge win but it will make following replacement of
    loop_index_mutex more obvious.

    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/block/loop.c | 16 +++++++---------
    1 file changed, 7 insertions(+), 9 deletions(-)

    --- a/drivers/block/loop.c
    +++ b/drivers/block/loop.c
    @@ -1641,12 +1641,15 @@ out:
    return err;
    }

    -static void __lo_release(struct loop_device *lo)
    +static void lo_release(struct gendisk *disk, fmode_t mode)
    {
    + struct loop_device *lo;
    int err;

    + mutex_lock(&loop_index_mutex);
    + lo = disk->private_data;
    if (atomic_dec_return(&lo->lo_refcnt))
    - return;
    + goto unlock_index;

    mutex_lock(&loop_ctl_mutex);
    if (lo->lo_flags & LO_FLAGS_AUTOCLEAR) {
    @@ -1656,7 +1659,7 @@ static void __lo_release(struct loop_dev
    */
    err = loop_clr_fd(lo);
    if (!err)
    - return;
    + goto unlock_index;
    } else if (lo->lo_state == Lo_bound) {
    /*
    * Otherwise keep thread (if running) and config,
    @@ -1667,12 +1670,7 @@ static void __lo_release(struct loop_dev
    }

    mutex_unlock(&loop_ctl_mutex);
    -}
    -
    -static void lo_release(struct gendisk *disk, fmode_t mode)
    -{
    - mutex_lock(&loop_index_mutex);
    - __lo_release(disk->private_data);
    +unlock_index:
    mutex_unlock(&loop_index_mutex);
    }


    \
     
     \ /
      Last update: 2019-01-21 14:52    [W:4.942 / U:0.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site