From: Philipp Reisner Date: Mon, 19 Jul 2010 13:04:57 +0000 (+0200) Subject: drbd: Disable delay probes for the upcomming release X-Git-Tag: v2.6.35.3~37 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/linux-imx.git/commitdiff_plain/cf6fdb61ecc841236ee8047e19ba1773a77850c2 drbd: Disable delay probes for the upcomming release commit 6710a5760355be8f2e51682f41b0d3fc76550309 upstream. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 16ef66a93eb4..60bbfcf7fa32 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)