---

yaml --- r: 309338 b: refs/heads/master c: c088b2d h: refs/heads/master v: v3
git-mirror · May 9, 2012 · 7e94ce9 · 7e94ce9
1 parent 4ec905e
commit 7e94ce9
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: 7ffcaa7194e2c96a738b936d2ae71c7f0c697c0a
+refs/heads/master: c088b2d904445f501c5aa7a6fc63ca9e8b96f224
diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c
@@ -247,9 +247,7 @@ void _tl_add_barrier(struct drbd_conf *mdev, struct drbd_tl_epoch *new)
 	new->n_writes = 0;
 
 	newest_before = mdev->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 (mdev->newest_tle != new) {
 		mdev->newest_tle->next = new;
 		mdev->newest_tle = new;