Skip to content

Commit

Permalink
drbd: Disabled the crashed_primary detection for re-attach of last da…
Browse files Browse the repository at this point in the history
…ta while IO is frozen

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
  • Loading branch information
Philipp Reisner committed Oct 14, 2010
1 parent 47ff2d0 commit 894c6a9
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/block/drbd/drbd_nl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,9 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp
else
clear_bit(CRASHED_PRIMARY, &mdev->flags);

if (drbd_md_test_flag(mdev->ldev, MDF_PRIMARY_IND)) {
if (drbd_md_test_flag(mdev->ldev, MDF_PRIMARY_IND) &&
!(mdev->state.role == R_PRIMARY && mdev->state.susp &&
mdev->sync_conf.on_no_data == OND_SUSPEND_IO)) {
set_bit(CRASHED_PRIMARY, &mdev->flags);
cp_discovered = 1;
}
Expand Down

0 comments on commit 894c6a9

Please sign in to comment.