From 5740beb3a57337e18930e623963b9d22b44c370a Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Wed, 22 Aug 2012 14:59:06 +0200 Subject: [PATCH] --- yaml --- r: 346252 b: refs/heads/master c: b792b655cdf79d4d90b4d46fa37e260ba0296850 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 682d4afdb2ca..babcab5c4bf0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc317a9ecd641b78a4b237cb22b30ecf11443c77 +refs/heads/master: b792b655cdf79d4d90b4d46fa37e260ba0296850 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index d831e85f1515..732053de1dbf 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -3314,7 +3314,9 @@ static void md_sync_timer_fn(unsigned long data) { struct drbd_conf *mdev = (struct drbd_conf *) data; - drbd_queue_work_front(&mdev->tconn->sender_work, &mdev->md_sync_work); + /* must not double-queue! */ + if (list_empty(&mdev->md_sync_work.list)) + drbd_queue_work_front(&mdev->tconn->sender_work, &mdev->md_sync_work); } static int w_md_sync(struct drbd_work *w, int unused)