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 24/47] block-rbd: Rename jump labels in rbd_request_lock()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Mon, 12 Sep 2016 19:38:52 +0200

    Adjust jump labels according to the current Linux coding style convention.

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

    diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
    index e175d21..09a0ed3 100644
    --- a/drivers/block/rbd.c
    +++ b/drivers/block/rbd.c
    @@ -3297,7 +3297,7 @@ static int rbd_request_lock(struct rbd_device *rbd_dev)
    &reply_pages, &reply_len);
    if (ret && ret != -ETIMEDOUT) {
    rbd_warn(rbd_dev, "failed to request lock: %d", ret);
    - goto out;
    + goto release_page_vector;
    }

    if (reply_len > 0 && reply_len <= PAGE_SIZE) {
    @@ -3321,7 +3321,7 @@ static int rbd_request_lock(struct rbd_device *rbd_dev)
    rbd_warn(rbd_dev,
    "duplicate lock owners detected");
    ret = -EIO;
    - goto out;
    + goto release_page_vector;
    }

    lock_owner_responded = true;
    @@ -3342,14 +3342,12 @@ static int rbd_request_lock(struct rbd_device *rbd_dev)
    rbd_warn(rbd_dev, "no lock owners detected");
    ret = -ETIMEDOUT;
    }
    -
    -out:
    + release_page_vector:
    ceph_release_page_vector(reply_pages, calc_pages_for(0, reply_len));
    return ret;
    -
    -e_inval:
    + e_inval:
    ret = -EINVAL;
    - goto out;
    + goto release_page_vector;
    }

    static void wake_requests(struct rbd_device *rbd_dev, bool wake_all)
    --
    2.10.0
    \
     
     \ /
      Last update: 2016-09-17 09:59    [W:4.108 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site