diff options
| author | Philipp Reisner | 2011-03-28 16:48:11 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:45:03 +0100 |
| commit | 2aebfabb17ecc434623732896a5834a9cb82a82d (patch) | |
| tree | 4570cd92a9f257ee8255f076bd0ca48014dd738e /drivers/block/drbd/drbd_state.c | |
| parent | drbd: Introduced drbd_read_state() (diff) | |
| download | kernel-qcow2-linux-2aebfabb17ecc434623732896a5834a9cb82a82d.tar.gz kernel-qcow2-linux-2aebfabb17ecc434623732896a5834a9cb82a82d.tar.xz kernel-qcow2-linux-2aebfabb17ecc434623732896a5834a9cb82a82d.zip | |
drbd: Renamed id_susp(union drbd_state s) to drbd_suspended(struct drbd_conf *)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_state.c')
| -rw-r--r-- | drivers/block/drbd/drbd_state.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 411d05f885e1..ae4a76ce8c1d 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -47,6 +47,11 @@ static enum drbd_state_rv is_valid_transition(union drbd_state os, union drbd_st static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state ns, const char **warn_sync_abort); +static inline bool is_susp(union drbd_state s) +{ + return s.susp || s.susp_nod || s.susp_fen; +} + bool conn_all_vols_unconf(struct drbd_tconn *tconn) { struct drbd_conf *mdev; @@ -1161,7 +1166,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, if (get_ldev(mdev)) { if ((ns.role == R_PRIMARY || ns.peer == R_PRIMARY) && mdev->ldev->md.uuid[UI_BITMAP] == 0 && ns.disk >= D_UP_TO_DATE) { - if (is_susp(mdev->state)) { + if (drbd_suspended(mdev)) { set_bit(NEW_CUR_UUID, &mdev->flags); } else { drbd_uuid_new_current(mdev); |