From: Fabian Frederick <fabf@skynet.be>
To: linux-kernel@vger.kernel.org
Cc: Philipp Reisner <philipp.reisner@linbit.com>,
Fabian Frederick <fabf@skynet.be>,
Lars Ellenberg <lars.ellenberg@linbit.com>,
drbd-dev@lists.linbit.com
Subject: [PATCH 05/21] drbd: rework is_valid_state()
Date: Fri, 27 Nov 2015 22:26:10 +0100 [thread overview]
Message-ID: <1448659575-13485-6-git-send-email-fabf@skynet.be> (raw)
In-Reply-To: <1448659575-13485-1-git-send-email-fabf@skynet.be>
Remove empty condition to avoid semantic warnings
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
drivers/block/drbd/drbd_state.c | 86 ++++++++++++++++++-----------------------
1 file changed, 38 insertions(+), 48 deletions(-)
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index 5a7ef78..a7631a3 100644
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -813,54 +813,44 @@ is_valid_state(struct drbd_device *device, union drbd_state ns)
}
}
- if (rv <= 0)
- /* already found a reason to abort */;
- else if (ns.role == R_SECONDARY && device->open_cnt)
- rv = SS_DEVICE_IN_USE;
-
- else if (ns.role == R_PRIMARY && ns.conn < C_CONNECTED && ns.disk < D_UP_TO_DATE)
- rv = SS_NO_UP_TO_DATE_DISK;
-
- else if (fp >= FP_RESOURCE &&
- ns.role == R_PRIMARY && ns.conn < C_CONNECTED && ns.pdsk >= D_UNKNOWN)
- rv = SS_PRIMARY_NOP;
-
- else if (ns.role == R_PRIMARY && ns.disk <= D_INCONSISTENT && ns.pdsk <= D_INCONSISTENT)
- rv = SS_NO_UP_TO_DATE_DISK;
-
- else if (ns.conn > C_CONNECTED && ns.disk < D_INCONSISTENT)
- rv = SS_NO_LOCAL_DISK;
-
- else if (ns.conn > C_CONNECTED && ns.pdsk < D_INCONSISTENT)
- rv = SS_NO_REMOTE_DISK;
-
- else if (ns.conn > C_CONNECTED && ns.disk < D_UP_TO_DATE && ns.pdsk < D_UP_TO_DATE)
- rv = SS_NO_UP_TO_DATE_DISK;
-
- else if ((ns.conn == C_CONNECTED ||
- ns.conn == C_WF_BITMAP_S ||
- ns.conn == C_SYNC_SOURCE ||
- ns.conn == C_PAUSED_SYNC_S) &&
- ns.disk == D_OUTDATED)
- rv = SS_CONNECTED_OUTDATES;
-
- else if ((ns.conn == C_VERIFY_S || ns.conn == C_VERIFY_T) &&
- (nc->verify_alg[0] == 0))
- rv = SS_NO_VERIFY_ALG;
-
- else if ((ns.conn == C_VERIFY_S || ns.conn == C_VERIFY_T) &&
- first_peer_device(device)->connection->agreed_pro_version < 88)
- rv = SS_NOT_SUPPORTED;
-
- else if (ns.role == R_PRIMARY && ns.disk < D_UP_TO_DATE && ns.pdsk < D_UP_TO_DATE)
- rv = SS_NO_UP_TO_DATE_DISK;
-
- else if ((ns.conn == C_STARTING_SYNC_S || ns.conn == C_STARTING_SYNC_T) &&
- ns.pdsk == D_UNKNOWN)
- rv = SS_NEED_CONNECTION;
-
- else if (ns.conn >= C_CONNECTED && ns.pdsk == D_UNKNOWN)
- rv = SS_CONNECTED_OUTDATES;
+ if (rv > 0) {
+ if (ns.role == R_SECONDARY && device->open_cnt)
+ rv = SS_DEVICE_IN_USE;
+ else if (ns.role == R_PRIMARY && ns.conn < C_CONNECTED &&
+ ns.disk < D_UP_TO_DATE)
+ rv = SS_NO_UP_TO_DATE_DISK;
+ else if (fp >= FP_RESOURCE && ns.role == R_PRIMARY &&
+ ns.conn < C_CONNECTED && ns.pdsk >= D_UNKNOWN)
+ rv = SS_PRIMARY_NOP;
+ else if (ns.role == R_PRIMARY && ns.disk <= D_INCONSISTENT &&
+ ns.pdsk <= D_INCONSISTENT)
+ rv = SS_NO_UP_TO_DATE_DISK;
+ else if (ns.conn > C_CONNECTED && ns.disk < D_INCONSISTENT)
+ rv = SS_NO_LOCAL_DISK;
+ else if (ns.conn > C_CONNECTED && ns.pdsk < D_INCONSISTENT)
+ rv = SS_NO_REMOTE_DISK;
+ else if (ns.conn > C_CONNECTED && ns.disk < D_UP_TO_DATE &&
+ ns.pdsk < D_UP_TO_DATE)
+ rv = SS_NO_UP_TO_DATE_DISK;
+ else if ((ns.conn == C_CONNECTED || ns.conn == C_WF_BITMAP_S ||
+ ns.conn == C_SYNC_SOURCE ||
+ ns.conn == C_PAUSED_SYNC_S) && ns.disk == D_OUTDATED)
+ rv = SS_CONNECTED_OUTDATES;
+ else if ((ns.conn == C_VERIFY_S || ns.conn == C_VERIFY_T) &&
+ (nc->verify_alg[0] == 0))
+ rv = SS_NO_VERIFY_ALG;
+ else if ((ns.conn == C_VERIFY_S || ns.conn == C_VERIFY_T) &&
+ first_peer_device(device)->connection->agreed_pro_version < 88)
+ rv = SS_NOT_SUPPORTED;
+ else if (ns.role == R_PRIMARY && ns.disk < D_UP_TO_DATE &&
+ ns.pdsk < D_UP_TO_DATE)
+ rv = SS_NO_UP_TO_DATE_DISK;
+ else if ((ns.conn == C_STARTING_SYNC_S ||
+ ns.conn == C_STARTING_SYNC_T) && ns.pdsk == D_UNKNOWN)
+ rv = SS_NEED_CONNECTION;
+ else if (ns.conn >= C_CONNECTED && ns.pdsk == D_UNKNOWN)
+ rv = SS_CONNECTED_OUTDATES;
+ }
rcu_read_unlock();
--
2.1.4
next prev parent reply other threads:[~2015-11-27 21:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-27 21:26 [PATCH 00/21] drbd: clean-up patchset Fabian Frederick
2015-11-27 21:26 ` [PATCH 01/21] drbd: debugfs: constify drbd_version_fops Fabian Frederick
2015-11-27 21:26 ` [PATCH 02/21] drbd: simplify drbd_md_set_sector_offsets() Fabian Frederick
2015-11-27 21:26 ` [PATCH 03/21] drbd: use seq_put instead of seq_print where possible Fabian Frederick
2015-11-27 21:26 ` [PATCH 04/21] drbd: include linux/uaccess.h instead of asm/uaccess.h Fabian Frederick
2015-11-27 21:26 ` Fabian Frederick [this message]
2015-11-27 21:26 ` [PATCH 06/21] drbd: use const char * const for drbd strings Fabian Frederick
2015-11-27 21:26 ` [PATCH 07/21] drbd: kerneldoc warning fix in w_e_end_data_req() Fabian Frederick
2015-11-27 21:26 ` [PATCH 08/21] drbd: use unsigned for one bit fields Fabian Frederick
2015-11-27 21:26 ` [PATCH 09/21] drbd: use bool for peer is_ states Fabian Frederick
2015-11-27 21:29 ` [PATCH 10/21] drbd: fix typo Fabian Frederick
2015-11-27 21:29 ` [PATCH 11/21] drbd: use | for bitmask combination Fabian Frederick
2015-11-27 21:29 ` [PATCH 12/21] drbd: use true/false for bool Fabian Frederick
2015-11-27 21:29 ` [PATCH 13/21] drbd: fix drbd_bm_init() comments Fabian Frederick
2015-11-27 21:29 ` [PATCH 14/21] drbd: clean-up receive_SyncParam() Fabian Frederick
2015-11-27 21:29 ` [PATCH 15/21] drbd: introduce peer state union Fabian Frederick
2015-11-27 21:29 ` [PATCH 16/21] drbd: fix maybe_pull_ahead() locking comments Fabian Frederick
2015-11-27 21:29 ` [PATCH 17/21] drbd: use bool for growing Fabian Frederick
2015-11-27 21:29 ` [PATCH 18/21] drbd: remove redundant declarations Fabian Frederick
2015-11-27 21:29 ` [PATCH 19/21] drbd: remove bm_vk_free() Fabian Frederick
2015-11-27 21:30 ` [PATCH 20/21] drbd: remove unused definitions Fabian Frederick
2015-11-27 21:30 ` [PATCH 21/21] drbd: replace if/BUG by BUG_ON Fabian Frederick
2015-12-01 8:55 ` [Drbd-dev] [PATCH 00/21] drbd: clean-up patchset Philipp Reisner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448659575-13485-6-git-send-email-fabf@skynet.be \
--to=fabf@skynet.be \
--cc=drbd-dev@lists.linbit.com \
--cc=lars.ellenberg@linbit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=philipp.reisner@linbit.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox