diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-28 12:55:03 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:44:58 +0100 |
| commit | 778bcf2e290fc9f13735c32640cdafb34794ebd1 (patch) | |
| tree | c86e4a14c423d88508299ebea7a5c3e5a7b0ca8f /drivers/block/drbd/drbd_state.c | |
| parent | 435693e89b7a918b14ea67968971a2d8d9e88df2 (diff) | |
| download | linux-778bcf2e290fc9f13735c32640cdafb34794ebd1.tar.gz linux-778bcf2e290fc9f13735c32640cdafb34794ebd1.tar.bz2 linux-778bcf2e290fc9f13735c32640cdafb34794ebd1.zip | |
drbd: Allow to disconnect if one volume is diskless
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 164a7f821c78..ca77da38a0dc 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -1433,6 +1433,9 @@ conn_is_valid_transition(struct drbd_tconn *tconn, union drbd_state mask, union os = mdev->state; ns = sanitize_state(mdev, apply_mask_val(os, mask, val), NULL); + if (flags & CS_IGN_OUTD_FAIL && ns.disk == D_OUTDATED && os.disk < D_OUTDATED) + ns.disk = os.disk; + if (ns.i == os.i) continue; @@ -1475,6 +1478,9 @@ conn_set_state(struct drbd_tconn *tconn, union drbd_state mask, union drbd_state ns = apply_mask_val(os, mask, val); ns = sanitize_state(mdev, ns, NULL); + if (flags & CS_IGN_OUTD_FAIL && ns.disk == D_OUTDATED && os.disk < D_OUTDATED) + ns.disk = os.disk; + rv = __drbd_set_state(mdev, ns, flags, NULL); if (rv < SS_SUCCESS) BUG(); |