aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2010-07-19 15:04:57 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-13 13:30:52 -0700
commitcf6fdb61ecc841236ee8047e19ba1773a77850c2 (patch)
tree57cdde72f4a493358515d06cd2a749f9d998ea66
parentd67a13b5b85e843609aac97965bb576544c0555e (diff)
downloadlinux-2.6.34-ux500-cf6fdb61ecc841236ee8047e19ba1773a77850c2.tar.gz
drbd: Disable delay probes for the upcomming release
commit 6710a5760355be8f2e51682f41b0d3fc76550309 upstream. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/block/drbd/drbd_main.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 16ef66a93eb..60bbfcf7fa3 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)