| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1465856799-2151-28-git-send-email-philipp.reisner@linbit.com> Date: Tue, 14 Jun 2016 00:26:36 +0200 From: Philipp Reisner <philipp.reisner@...bit.com> To: Jens Axboe <axboe@...com>, linux-kernel@...r.kernel.org Cc: drbd-dev@...ts.linbit.com Subject: [PATCH 27/30] drbd: get rid of empty statement in is_valid_state From: Roland Kammerer <roland.kammerer@...bit.com> This should silence a warning about an empty statement. Thanks to Fabian Frederick <fabf@...net.be> who sent a patch I modified to be smaller and avoids an additional indent level. Signed-off-by: Roland Kammerer <roland.kammerer@...bit.com> Signed-off-by: Philipp Reisner <philipp.reisner@...bit.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
Powered by blists - more mailing lists