Prev: [52/67] USB: ftdi_sio: device id for Navitator
Next: [21/67] mm: fix corruption of hibernation caused by reusing swap during image saving
From: Greg KH on 11 Aug 2010 20:20
2.6.35-stable review patch. If anyone has any objections, please let us know.

------------------

From: Philipp Reisner <philipp.reisner(a)linbit.com>

commit 6710a5760355be8f2e51682f41b0d3fc76550309 upstream.

Signed-off-by: Philipp Reisner <philipp.reisner(a)linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg(a)linbit.com>
Signed-off-by: Jens Axboe <jaxboe(a)fusionio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
drivers/block/drbd/drbd_main.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

--- 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_

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)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [52/67] USB: ftdi_sio: device id for Navitator
Next: [21/67] mm: fix corruption of hibernation caused by reusing swap during image saving