summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2012-03-23 13:57:13 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-05-09 15:16:46 +0200
commitc088b2d904445f501c5aa7a6fc63ca9e8b96f224 (patch)
tree67624412d3c9afbf71163174983079f3dcec363b /drivers/block
parent7ffcaa7194e2c96a738b936d2ae71c7f0c697c0a (diff)
downloadlinux-c088b2d904445f501c5aa7a6fc63ca9e8b96f224.tar.gz
linux-c088b2d904445f501c5aa7a6fc63ca9e8b96f224.tar.xz
linux-c088b2d904445f501c5aa7a6fc63ca9e8b96f224.zip
drbd: don't pretend that barrier_nr == 0 was special
We used to have a barrier implementation where barrier_nr 0 was reserved. That is long gone. Just use the full sequence space. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-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 02fd1e109cf6..519f286a4299 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -247,9 +247,7 @@ void _tl_add_barrier(struct drbd_conf *mdev, struct drbd_tl_epoch *new)
new->n_writes = 0;
newest_before = mdev->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 (mdev->newest_tle != new) {
mdev->newest_tle->next = new;
mdev->newest_tle = new;