summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-05-17 14:48:55 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2011-05-24 10:07:50 +0200
commitfa7d939663b61f5c2bd3436d3aa126d4c0f47aa8 (patch)
tree2fa5264c72d2b5e8fa8414d1ba90217edc1a7731 /drivers/block
parenta8e407925d49c521151dd24b6376c1f9a04a093f (diff)
downloadlinux-fa7d939663b61f5c2bd3436d3aa126d4c0f47aa8.tar.gz
linux-fa7d939663b61f5c2bd3436d3aa126d4c0f47aa8.tar.bz2
linux-fa7d939663b61f5c2bd3436d3aa126d4c0f47aa8.zip
drbd: Disallow the peer_disk_state to be D_OUTDATED while connected
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index fd308864833f..ce6a764e905b 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -745,6 +745,9 @@ is_valid_state(struct drbd_conf *mdev, union drbd_state ns)
mdev->agreed_pro_version < 88)
rv = SS_NOT_SUPPORTED;
+ else if (ns.conn >= C_CONNECTED && ns.pdsk == D_UNKNOWN)
+ rv = SS_CONNECTED_OUTDATES;
+
return rv;
}