From d2abf8c7c50e561ffaa9b1e762c4a2e2b6177f6e Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Mon, 26 Mar 2012 16:25:41 +0200
Subject: [PATCH] --- yaml --- r: 346175 b: refs/heads/master c:
 f9916d61a40e7ad43c2a20444894f85c45512f91 h: refs/heads/master i:   346173:
 d4312220f4b8fae65bc7c44171987c9e2b2cc235   346171:
 d130a87ef58464a186b673eacbef2ea706e3ac9a   346167:
 2f54fd12521e9edf0aeff46da735d63d44ad70aa   346159:
 19c7df79518f8689783900b52949707cadef61d4   346143:
 558dcac8d13c80980e581b599d004fd09744368c   346111:
 d15aff18d8d0cc2de217a2b2cea0e1a38dcb9ec8 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/block/drbd/drbd_main.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8b9365b3f0a6..db2fe10eee48 100644
--- 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
index 4a59b8a8ba7a..a0045ac88040 100644
--- 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;