summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_main.c
diff options
context:
space:
mode:
authorPhilipp Reisner2011-03-14 11:54:47 +0100
committerPhilipp Reisner2012-05-09 15:10:38 +0200
commit02ee8f95fadf7c94b3d28df436a095152f6392b2 (patch)
tree14ae2da3dc302a7f061023d9ed0eab3c790ae458 /drivers/block/drbd/drbd_main.c
parentdrbd: Allow new IOs while the local disk in in FAILED state (diff)
downloadkernel-qcow2-linux-02ee8f95fadf7c94b3d28df436a095152f6392b2.tar.gz
kernel-qcow2-linux-02ee8f95fadf7c94b3d28df436a095152f6392b2.tar.xz
kernel-qcow2-linux-02ee8f95fadf7c94b3d28df436a095152f6392b2.zip
drbd: Force flag for the detach operation
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_main.c')
-rw-r--r--drivers/block/drbd/drbd_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 1b59ab3ab9c7..bc8a8a7556da 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -495,7 +495,7 @@ static int cl_wide_st_chg(struct drbd_conf *mdev,
((os.role != R_PRIMARY && ns.role == R_PRIMARY) ||
(os.conn != C_STARTING_SYNC_T && ns.conn == C_STARTING_SYNC_T) ||
(os.conn != C_STARTING_SYNC_S && ns.conn == C_STARTING_SYNC_S) ||
- (os.disk != D_DISKLESS && ns.disk == D_DISKLESS))) ||
+ (os.disk != D_FAILED && ns.disk == D_FAILED))) ||
(os.conn >= C_CONNECTED && ns.conn == C_DISCONNECTING) ||
(os.conn == C_CONNECTED && ns.conn == C_VERIFY_S);
}