diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-06-18 10:03:20 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-14 08:55:11 -0400 |
commit | 894c6a946199cf91e52bc1864c3dc6529cceb3db (patch) | |
tree | 8fcb4eee7d538717943fba7d55f079efac95fbe0 /drivers/block/drbd/drbd_nl.c | |
parent | 47ff2d0a8e7ce87fed180729e8341f650bf585c8 (diff) |
drbd: Disabled the crashed_primary detection for re-attach of last data while IO is frozen
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_nl.c')
-rw-r--r-- | drivers/block/drbd/drbd_nl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 5288bd72cd27..cda7cb3202b9 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c | |||
@@ -1033,7 +1033,9 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp | |||
1033 | else | 1033 | else |
1034 | clear_bit(CRASHED_PRIMARY, &mdev->flags); | 1034 | clear_bit(CRASHED_PRIMARY, &mdev->flags); |
1035 | 1035 | ||
1036 | if (drbd_md_test_flag(mdev->ldev, MDF_PRIMARY_IND)) { | 1036 | if (drbd_md_test_flag(mdev->ldev, MDF_PRIMARY_IND) && |
1037 | !(mdev->state.role == R_PRIMARY && mdev->state.susp && | ||
1038 | mdev->sync_conf.on_no_data == OND_SUSPEND_IO)) { | ||
1037 | set_bit(CRASHED_PRIMARY, &mdev->flags); | 1039 | set_bit(CRASHED_PRIMARY, &mdev->flags); |
1038 | cp_discovered = 1; | 1040 | cp_discovered = 1; |
1039 | } | 1041 | } |