drbd: don't pretend that barrier_nr == 0 was special
authorLars Ellenberg <lars.ellenberg@linbit.com>
Mon, 26 Mar 2012 14:25:41 +0000 (16:25 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:58:21 +0000 (16:58 +0100)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_main.c

index 4a59b8a..a0045ac 100644 (file)
@@ -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;