diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-07-19 15:04:57 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 18:53:57 +0200 |
| commit | 6710a5760355be8f2e51682f41b0d3fc76550309 (patch) | |
| tree | 29b40f369bcc165f97e09547540c2df9ff62007e | |
| parent | c284de61db31669cce547ffc99efda971146719d (diff) | |
| download | kernel_samsung_aries-6710a5760355be8f2e51682f41b0d3fc76550309.zip kernel_samsung_aries-6710a5760355be8f2e51682f41b0d3fc76550309.tar.gz kernel_samsung_aries-6710a5760355be8f2e51682f41b0d3fc76550309.tar.bz2 | |
drbd: Disable delay probes for the upcomming release
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Cc: stable@kernel.org
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index d2b6764..0c1e84a 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) |