From 80607879ad299c1e9f9eeddfca3255a6e23db156 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Mon, 19 Jul 2010 15:04:57 +0200 Subject: [PATCH] --- yaml --- r: 208347 b: refs/heads/master c: 6710a5760355be8f2e51682f41b0d3fc76550309 h: refs/heads/master i: 208345: 2a8ea66baa69ac281c0b85e7b658e2e09c54859c 208343: 614c4fd90639b5e280d63acb6e5eac8501dee0fb v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 88c6e18291a2..a96e781b1adc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c284de61db31669cce547ffc99efda971146719d +refs/heads/master: 6710a5760355be8f2e51682f41b0d3fc76550309 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index d2b6764a7b1f..0c1e84a751d7 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -2371,11 +2371,7 @@ static int _drbd_send_zc_ee(struct drbd_conf *mdev, struct drbd_epoch_entry *e) static void consider_delay_probes(struct drbd_conf *mdev) { - if (mdev->state.conn != C_SYNC_SOURCE || mdev->agreed_pro_version < 93) - return; - - if (mdev->dp_volume_last + mdev->sync_conf.dp_volume * 2 < mdev->send_cnt) - drbd_send_delay_probes(mdev); + return; } static int w_delay_probes(struct drbd_conf *mdev, struct drbd_work *w, int cancel)