From: Philipp Reisner Date: Mon, 19 Jul 2010 13:04:57 +0000 (+0200) Subject: drbd: Disable delay probes for the upcomming release X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6710a5760355be8f2e51682f41b0d3fc76550309;p=linux-beck.git drbd: Disable delay probes for the upcomming release Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Cc: stable@kernel.org Signed-off-by: Jens Axboe --- diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index d2b6764a7b1f..0c1e84a751d7 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/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)