lkml.org 
[lkml]   [2020]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 039/244] blk-mq-debugfs: update blk_queue_flag_name[] accordingly for new flags
    Date
    From: Hou Tao <houtao1@huawei.com>

    [ Upstream commit bfe373f608cf81b7626dfeb904001b0e867c5110 ]

    Else there may be magic numbers in /sys/kernel/debug/block/*/state.

    Signed-off-by: Hou Tao <houtao1@huawei.com>
    Reviewed-by: Bart Van Assche <bvanassche@acm.org>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    block/blk-mq-debugfs.c | 3 +++
    include/linux/blkdev.h | 1 +
    2 files changed, 4 insertions(+)

    diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
    index b3f2ba483992d..121f4c1e0697b 100644
    --- a/block/blk-mq-debugfs.c
    +++ b/block/blk-mq-debugfs.c
    @@ -125,6 +125,9 @@ static const char *const blk_queue_flag_name[] = {
    QUEUE_FLAG_NAME(REGISTERED),
    QUEUE_FLAG_NAME(SCSI_PASSTHROUGH),
    QUEUE_FLAG_NAME(QUIESCED),
    + QUEUE_FLAG_NAME(PCI_P2PDMA),
    + QUEUE_FLAG_NAME(ZONE_RESETALL),
    + QUEUE_FLAG_NAME(RQ_ALLOC_TIME),
    };
    #undef QUEUE_FLAG_NAME

    diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
    index 32868fbedc9e9..02809e4dd661e 100644
    --- a/include/linux/blkdev.h
    +++ b/include/linux/blkdev.h
    @@ -585,6 +585,7 @@ struct request_queue {
    u64 write_hints[BLK_MAX_WRITE_HINTS];
    };

    +/* Keep blk_queue_flag_name[] in sync with the definitions below */
    #define QUEUE_FLAG_STOPPED 0 /* queue is stopped */
    #define QUEUE_FLAG_DYING 1 /* queue being torn down */
    #define QUEUE_FLAG_NOMERGES 3 /* disable merge attempts */
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-20 18:11    [W:4.228 / U:0.564 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site