From c989431153ef3833079ecbbae98b92ee2df60aa3 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Wed, 5 May 2010 20:53:33 +0200 Subject: [PATCH] --- yaml --- r: 196859 b: refs/heads/master c: a8cdfd8d3bf0b6d2bbe792f5e74f54ccc6bc1d4f h: refs/heads/master i: 196857: 297ef85aeaf91b66db81a92f7cbf1d109f451fe3 196855: efc168ea3742ecf0659eb5095d7618f2cfd3c6fb v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_int.h | 1 + trunk/drivers/block/drbd/drbd_main.c | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1789ec727e61..aa9e13e34c26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eedf386ae9d9e80a5669107e960090951e62f3a3 +refs/heads/master: a8cdfd8d3bf0b6d2bbe792f5e74f54ccc6bc1d4f diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h index 210870ed8a79..37380d2c869d 100644 --- a/trunk/drivers/block/drbd/drbd_int.h +++ b/trunk/drivers/block/drbd/drbd_int.h @@ -268,6 +268,7 @@ static inline const char *cmdname(enum drbd_packets cmd) [P_CSUM_RS_REQUEST] = "CsumRSRequest", [P_RS_IS_IN_SYNC] = "CsumRSIsInSync", [P_COMPRESSED_BITMAP] = "CBitmap", + [P_DELAY_PROBE] = "DelayProbe", [P_MAX_CMD] = NULL, }; diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 98785d08cf70..44cc7b415ed4 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -2207,9 +2207,6 @@ static int drbd_send_delay_probe(struct drbd_conf *mdev, struct drbd_socket *ds) } mutex_unlock(&ds->mutex); - mdev->dp_volume_last = mdev->send_cnt; - mod_timer(&mdev->delay_probe_timer, jiffies + mdev->sync_conf.dp_interval * HZ / 10); - return ok; } @@ -2221,6 +2218,9 @@ static int drbd_send_delay_probes(struct drbd_conf *mdev) ok = drbd_send_delay_probe(mdev, &mdev->meta); ok = ok && drbd_send_delay_probe(mdev, &mdev->data); + mdev->dp_volume_last = mdev->send_cnt; + mod_timer(&mdev->delay_probe_timer, jiffies + mdev->sync_conf.dp_interval * HZ / 10); + return ok; } @@ -2374,7 +2374,8 @@ static void delay_probe_timer_fn(unsigned long data) { struct drbd_conf *mdev = (struct drbd_conf *) data; - drbd_queue_work(&mdev->data.work, &mdev->delay_probe_work); + if (list_empty(&mdev->delay_probe_work.list)) + drbd_queue_work(&mdev->data.work, &mdev->delay_probe_work); } /* Used to send write requests