---

yaml --- r: 346246 b: refs/heads/master c: 08332d7 h: refs/heads/master v: v3
git-mirror · Nov 9, 2012 · a446a11 · a446a11
1 parent bc6c16e
commit a446a11
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;