From a446a112e8f18aa0f88eea46bec235106060e955 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Fri, 17 Aug 2012 15:09:13 +0200 Subject: [PATCH] --- yaml --- r: 346246 b: refs/heads/master c: 08332d73250eec349b055843a503d45a9b5c13b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3fa567e0e7fe..b72e781fa612 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 155522df5b8ac24ee66a903e51d5b3023b2a76f9 +refs/heads/master: 08332d73250eec349b055843a503d45a9b5c13b6 diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 4ba530cf810f..d5afa0a81fd0 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -4526,6 +4526,10 @@ static int drbd_disconnected(struct drbd_conf *mdev) necessary to reclain net_ee in drbd_finish_peer_reqs(). */ drbd_flush_workqueue(mdev); + /* need to do it again, drbd_finish_peer_reqs() may have populated it + * again via drbd_try_clear_on_disk_bm(). */ + drbd_rs_cancel_all(mdev); + kfree(mdev->p_uuid); mdev->p_uuid = NULL;