---

yaml --- r: 242907 b: refs/heads/master c: 039312b h: refs/heads/master i: 242905: d194ba5 242903: a126b35 v: v3
git-mirror · Mar 10, 2011 · fb20953 · fb20953
1 parent 368023e
commit fb20953
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 873b0d5f98ab70e4df7a62b2ef0305373f88f330
+refs/heads/master: 039312b6481e2928f3be19fee94c83327d93e4c7
diff --git a/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c
@@ -983,13 +983,7 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio, uns
 		}
 
 		if (congested) {
-			/* rs_pending_cnt must be zero, otherwise the two peers
-			   might get different bitmaps. With sane configurations
-			   the resync stalls long before we might want to go into
-			   AHEAD mode.
-			   We could force the resync into PAUSE mode here if
-			   rs_pending_cnt is > 0 ... */
-			queue_barrier(mdev);
+			queue_barrier(mdev); /* last barrier, after mirrored writes */
 
 			if (mdev->net_conf->on_congestion == OC_PULL_AHEAD)
 				_drbd_set_state(_NS(mdev, conn, C_AHEAD), 0, NULL);