diff options
| author | Lars Ellenberg | 2012-03-26 15:57:00 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:58:18 +0100 |
| commit | e8744f5aca47cac36af1e2b5eb55f7131bf198df (patch) | |
| tree | 7a3ae9ec952433995dcb61e00bfb42989e0a08a7 /drivers/block/drbd/drbd_state.c | |
| parent | drbd: Fix a potential write ordering issue on SyncTarget nodes (diff) | |
| download | kernel-qcow2-linux-e8744f5aca47cac36af1e2b5eb55f7131bf198df.tar.gz kernel-qcow2-linux-e8744f5aca47cac36af1e2b5eb55f7131bf198df.tar.xz kernel-qcow2-linux-e8744f5aca47cac36af1e2b5eb55f7131bf198df.zip | |
drbd: Fixed detach
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c index 96fdbfa79a6c..8c5cedfb4d9c 100644 --- a/drivers/block/drbd/drbd_state.c +++ b/drivers/block/drbd/drbd_state.c @@ -199,7 +199,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) || (os.conn == C_CONNECTED && ns.conn == C_WF_REPORT_PARAMS); |