From 1c3c061605c0403a052924478b17a08ab9ee3bee Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Fri, 23 Oct 2009 13:57:45 +0200 Subject: [PATCH] --- yaml --- r: 172941 b: refs/heads/master c: e656ec8ae2c0319b6d52834695f9635217d62de5 h: refs/heads/master i: 172939: eb1f39b09e1885b8586678a832643e8045746ebb v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2c516ba148df..efd06415c3f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a4921662513ae60dc638c8e13fbe3439d84db64 +refs/heads/master: e656ec8ae2c0319b6d52834695f9635217d62de5 diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index d9312b45393f..9bbc509443e5 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -3619,10 +3619,6 @@ static void drbd_disconnect(struct drbd_conf *mdev) set_bit(STOP_SYNC_TIMER, &mdev->flags); resync_timer_fn((unsigned long)mdev); - /* so we can be sure that all remote or resync reads - * made it at least to net_ee */ - wait_event(mdev->misc_wait, !atomic_read(&mdev->local_cnt)); - /* wait for all w_e_end_data_req, w_e_end_rsdata_req, w_send_barrier, * w_make_resync_request etc. which may still be on the worker queue * to be "canceled" */