From: Lars Ellenberg Date: Mon, 26 Mar 2012 14:25:41 +0000 (+0200) Subject: drbd: don't pretend that barrier_nr == 0 was special X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f9916d61a40e7ad43c2a20444894f85c45512f91;p=deliverable%2Flinux.git drbd: don't pretend that barrier_nr == 0 was special Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg --- diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 4a59b8a8ba7a..a0045ac88040 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/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;