From 93144f76bb3e22bc850cafafa489fc904b6c93db Mon Sep 17 00:00:00 2001 From: Simon Graham Date: Fri, 21 Dec 2007 22:27:56 -0500 Subject: [PATCH] Revert "Fixing "drbdadm pause-sync r0 ; drbdadm resume-sync r0"" This reverts commit 68660cd885564b590c0559efdbb28f9edcb87ff2. The change caused the sync to stall when paused and resumed quickly --- drbd/drbd_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drbd/drbd_main.c b/drbd/drbd_main.c index 8d18601..1430794 100644 --- a/drbd/drbd_main.c +++ b/drbd/drbd_main.c @@ -785,7 +785,7 @@ int _drbd_set_state(drbd_dev* mdev, drbd_state_t ns,enum chg_state_flags flags) INFO("Syncer continues.\n"); mdev->rs_paused += (long)jiffies-(long)mdev->rs_mark_time; if (ns.conn == SyncTarget) { - if (!test_and_clear_bit(STOP_SYNC_TIMER,&mdev->flags)) { + if (!test_bit(STOP_SYNC_TIMER,&mdev->flags)) { mod_timer(&mdev->resync_timer,jiffies); } /* This if (!test_bit) is only needed for the case -- 1.5.4.rc1