lkml.org 
[lkml]   [2016]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 27/30] drbd: get rid of empty statement in is_valid_state
    Date
    From: Roland Kammerer <roland.kammerer@linbit.com>

    This should silence a warning about an empty statement. Thanks to Fabian
    Frederick <fabf@skynet.be> who sent a patch I modified to be smaller and
    avoids an additional indent level.

    Signed-off-by: Roland Kammerer <roland.kammerer@linbit.com>
    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    ---
    drivers/block/drbd/drbd_state.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
    index aca68a5..eea0c4a 100644
    --- a/drivers/block/drbd/drbd_state.c
    +++ b/drivers/block/drbd/drbd_state.c
    @@ -814,7 +814,7 @@ is_valid_state(struct drbd_device *device, union drbd_state ns)
    }

    if (rv <= 0)
    - /* already found a reason to abort */;
    + goto out; /* already found a reason to abort */
    else if (ns.role == R_SECONDARY && device->open_cnt)
    rv = SS_DEVICE_IN_USE;

    @@ -862,6 +862,7 @@ is_valid_state(struct drbd_device *device, union drbd_state ns)
    else if (ns.conn >= C_CONNECTED && ns.pdsk == D_UNKNOWN)
    rv = SS_CONNECTED_OUTDATES;

    +out:
    rcu_read_unlock();

    return rv;
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-06-13 16:41    [W:3.185 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site