Merge tag 'irq-core-2020-12-23' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / block / blk-mq-debugfs.c

diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index 3f09bcb..3094542 100644 (file)
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -116,6 +116,7 @@ static const char *const blk_queue_flag_name[] = {
        QUEUE_FLAG_NAME(SAME_FORCE),
        QUEUE_FLAG_NAME(DEAD),
        QUEUE_FLAG_NAME(INIT_DONE),
+       QUEUE_FLAG_NAME(STABLE_WRITES),
        QUEUE_FLAG_NAME(POLL),
        QUEUE_FLAG_NAME(WC),
        QUEUE_FLAG_NAME(FUA),
@@ -240,7 +241,7 @@ static const char *const alloc_policy_name[] = {
 #define HCTX_FLAG_NAME(name) [ilog2(BLK_MQ_F_##name)] = #name
 static const char *const hctx_flag_name[] = {
        HCTX_FLAG_NAME(SHOULD_MERGE),
-       HCTX_FLAG_NAME(TAG_SHARED),
+       HCTX_FLAG_NAME(TAG_QUEUE_SHARED),
        HCTX_FLAG_NAME(BLOCKING),
        HCTX_FLAG_NAME(NO_SCHED),
        HCTX_FLAG_NAME(STACKING),
@@ -452,11 +453,11 @@ static void blk_mq_debugfs_tags_show(struct seq_file *m,
                   atomic_read(&tags->active_queues));
 
        seq_puts(m, "\nbitmap_tags:\n");
-       sbitmap_queue_show(&tags->bitmap_tags, m);
+       sbitmap_queue_show(tags->bitmap_tags, m);
 
        if (tags->nr_reserved_tags) {
                seq_puts(m, "\nbreserved_tags:\n");
-               sbitmap_queue_show(&tags->breserved_tags, m);
+               sbitmap_queue_show(tags->breserved_tags, m);
        }
 }
 
@@ -487,7 +488,7 @@ static int hctx_tags_bitmap_show(void *data, struct seq_file *m)
        if (res)
                goto out;
        if (hctx->tags)
-               sbitmap_bitmap_show(&hctx->tags->bitmap_tags.sb, m);
+               sbitmap_bitmap_show(&hctx->tags->bitmap_tags->sb, m);
        mutex_unlock(&q->sysfs_lock);
 
 out:
@@ -521,7 +522,7 @@ static int hctx_sched_tags_bitmap_show(void *data, struct seq_file *m)
        if (res)
                goto out;
        if (hctx->sched_tags)
-               sbitmap_bitmap_show(&hctx->sched_tags->bitmap_tags.sb, m);
+               sbitmap_bitmap_show(&hctx->sched_tags->bitmap_tags->sb, m);
        mutex_unlock(&q->sysfs_lock);
 
 out: