lkml.org 
[lkml]   [2016]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 19/47] block-rbd: Rename a jump label in rbd_reregister_watch()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Mon, 12 Sep 2016 19:31:04 +0200

    Adjust a jump label according to the current Linux coding style convention.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/block/rbd.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
    index 2b5f76e..97dbc1a 100644
    --- a/drivers/block/rbd.c
    +++ b/drivers/block/rbd.c
    @@ -3950,7 +3950,7 @@ static void rbd_reregister_watch(struct work_struct *work)

    mutex_lock(&rbd_dev->watch_mutex);
    if (rbd_dev->watch_state != RBD_WATCH_STATE_ERROR)
    - goto fail_unlock;
    + goto unlock;

    ret = __rbd_register_watch(rbd_dev);
    if (ret) {
    @@ -3959,7 +3959,7 @@ static void rbd_reregister_watch(struct work_struct *work)
    queue_delayed_work(rbd_dev->task_wq,
    &rbd_dev->watch_dwork,
    RBD_RETRY_DELAY);
    - goto fail_unlock;
    + goto unlock;
    }

    rbd_dev->watch_state = RBD_WATCH_STATE_REGISTERED;
    @@ -3980,8 +3980,7 @@ static void rbd_reregister_watch(struct work_struct *work)
    up_write(&rbd_dev->lock_rwsem);
    wake_requests(rbd_dev, true);
    return;
    -
    -fail_unlock:
    + unlock:
    mutex_unlock(&rbd_dev->watch_mutex);
    up_write(&rbd_dev->lock_rwsem);
    }
    --
    2.10.0
    \
     
     \ /
      Last update: 2016-09-17 09:59    [W:4.021 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site