---

yaml --- r: 346175 b: refs/heads/master c: f9916d6 h: refs/heads/master i: 346173: d431222 346171: d130a87 346167: 2f54fd1 346159: 19c7df7 346143: 558dcac 346111: d15aff1 v: v3
git-mirror · Nov 8, 2012 · d2abf8c · d2abf8c
1 parent be6ff39
commit d2abf8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0642d5f8e0c974705932a4c3adf02192b9528d7b
+refs/heads/master: f9916d61a40e7ad43c2a20444894f85c45512f91
diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c
@@ -250,9 +250,7 @@ void _tl_add_barrier(struct drbd_tconn *tconn, struct drbd_tl_epoch *new)
 	new->n_writes = 0;
 
 	newest_before = tconn->newest_tle;
-	/* never send a barrier number == 0, because that is special-cased
-	 * when using TCQ for our write ordering code */
-	new->br_number = (newest_before->br_number+1) ?: 1;
+	new->br_number = newest_before->br_number+1;
 	if (tconn->newest_tle != new) {
 		tconn->newest_tle->next = new;
 		tconn->newest_tle = new;