diff options
| author | Philipp Reisner | 2011-03-16 14:43:36 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-04 00:16:31 +0100 |
| commit | 047e95e259e81d7b97eca10cda0aa93082531ac1 (patch) | |
| tree | bc069b550dee8bc44226182ce753491ba55b5ae6 /drivers/block/drbd/drbd_state.c | |
| parent | drbd: fix conn_reconfig_start without conn_reconfig_done in drbd_adm_attach (diff) | |
| download | kernel-qcow2-linux-047e95e259e81d7b97eca10cda0aa93082531ac1.tar.gz kernel-qcow2-linux-047e95e259e81d7b97eca10cda0aa93082531ac1.tar.xz kernel-qcow2-linux-047e95e259e81d7b97eca10cda0aa93082531ac1.zip | |
drbd: Allow volumes to become primary only on one side
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 | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 886b996ec7b3..11685658659e 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -329,6 +329,18 @@ static void print_state_change(struct drbd_conf *mdev, union drbd_state os, unio dev_info(DEV, "%s\n", pb); } +static bool vol_has_primary_peer(struct drbd_tconn *tconn) +{ + struct drbd_conf *mdev; + int minor; + + idr_for_each_entry(&tconn->volumes, mdev, minor) { + if (mdev->state.peer == R_PRIMARY) + return true; + } + return false; +} + /** * is_valid_state() - Returns an SS_ error code if ns is not valid * @mdev: DRBD device. @@ -349,9 +361,12 @@ is_valid_state(struct drbd_conf *mdev, union drbd_state ns) } if (get_net_conf(mdev->tconn)) { - if (!mdev->tconn->net_conf->two_primaries && - ns.role == R_PRIMARY && ns.peer == R_PRIMARY) - rv = SS_TWO_PRIMARIES; + if (!mdev->tconn->net_conf->two_primaries && ns.role == R_PRIMARY) { + if (ns.peer == R_PRIMARY) + rv = SS_TWO_PRIMARIES; + else if (vol_has_primary_peer(mdev->tconn)) + rv = SS_O_VOL_PEER_PRI; + } put_net_conf(mdev->tconn); } |