aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/drbd/drbd_main.c
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2012-03-26 16:25:41 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:58:21 +0100
commitf9916d61a40e7ad43c2a20444894f85c45512f91 (patch)
tree13619c5a7bb935850e5b8281e99609dc041fca62 /drivers/block/drbd/drbd_main.c
parent0642d5f8e0c974705932a4c3adf02192b9528d7b (diff)
downloadvexpress-lsk-f9916d61a40e7ad43c2a20444894f85c45512f91.tar.gz
drbd: don't pretend that barrier_nr == 0 was special
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
-rw-r--r--drivers/block/drbd/drbd_main.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 4a59b8a8ba7..a0045ac8804 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;