diff options
| author | Roland Kammerer <roland.kammerer@linbit.com> | 2016-06-14 00:26:36 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-13 21:43:07 -0600 |
| commit | 4e526a00467ce18c2262d3a1a5aa9f975034aacb (patch) | |
| tree | 4bf291b91ab8d421b343b31d85f5e6f8f773804f /drivers/block | |
| parent | 7e5fec31685a5c69b81e9005eaed44318880d881 (diff) | |
| download | blackbird-op-linux-4e526a00467ce18c2262d3a1a5aa9f975034aacb.tar.gz blackbird-op-linux-4e526a00467ce18c2262d3a1a5aa9f975034aacb.zip | |
drbd: get rid of empty statement in is_valid_state
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>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index aca68a581b06..eea0c4aec978 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; |
