---

yaml --- r: 346147 b: refs/heads/master c: d10b4ea h: refs/heads/master i: 346145: d5c7c92 346143: 558dcac v: v3
git-mirror · Nov 8, 2012 · 1f46c32 · 1f46c32
1 parent 4b48897
commit 1f46c32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 615e087fbd7483fafa28c8a1a4d1656251e0604d
+refs/heads/master: d10b4ea32bf2b77a3d56a20992cd549978df7b38
diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c
@@ -4440,6 +4440,11 @@ static int drbd_disconnected(struct drbd_conf *mdev)
 
 	drbd_finish_peer_reqs(mdev);
 
+	/* This second workqueue flush is necessary, since drbd_finish_peer_reqs()
+	   might have issued a work again. The one before drbd_finish_peer_reqs() is
+	   necessary to reclain net_ee in drbd_finish_peer_reqs(). */
+	drbd_flush_workqueue(mdev);
+
 	kfree(mdev->p_uuid);
 	mdev->p_uuid = NULL;