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;