bfq-iosched: don't worry about reserved tags in limit_depth
authorJens Axboe <axboe@kernel.dk>
Wed, 9 May 2018 19:12:10 +0000 (13:12 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 10 May 2018 17:27:17 +0000 (11:27 -0600)
Reserved tags are used for error handling, we don't need to
care about them for regular IO. The core won't call us for these
anyway.

Acked-by: Paolo Valente <paolo.valente@linaro.org>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bfq-iosched.c

index eefd8a4..db38e88 100644 (file)
@@ -542,14 +542,7 @@ static void bfq_limit_depth(unsigned int op, struct blk_mq_alloc_data *data)
        if (op_is_sync(op) && !op_is_write(op))
                return;
 
-       if (data->flags & BLK_MQ_REQ_RESERVED) {
-               if (unlikely(!tags->nr_reserved_tags)) {
-                       WARN_ON_ONCE(1);
-                       return;
-               }
-               bt = &tags->breserved_tags;
-       } else
-               bt = &tags->bitmap_tags;
+       bt = &tags->bitmap_tags;
 
        if (unlikely(bfqd->sb_shift != bt->sb.shift))
                bfq_update_depths(bfqd, bt);