Commit bebe84eb authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: remove blk-mq-tag.h 



blk-mq-tag.h is always included by blk-mq.h, and causes recursive
inclusion hell with further changes.  Just merge it into blk-mq.h
instead.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230413064057.707578-3-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 50947d7f

block/bfq-iosched.c

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ 
#include "elevator.h"

#include "blk.h"

#include "blk-mq.h"

#include "blk-mq-tag.h"

#include "blk-mq-sched.h"

#include "bfq-iosched.h"

#include "blk-wbt.h"

block/blk-flush.c

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ 


#include "blk.h"

#include "blk-mq.h"

#include "blk-mq-tag.h"

#include "blk-mq-sched.h"



/* PREFLUSH/FUA sequences */

block/blk-mq-debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include "blk-mq.h"

#include "blk-mq-debugfs.h"

#include "blk-mq-sched.h"

#include "blk-mq-tag.h"

#include "blk-rq-qos.h"



static int queue_poll_stat_show(void *data, struct seq_file *m)

block/blk-mq-sched.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "blk-mq.h"

#include "blk-mq-debugfs.h"

#include "blk-mq-sched.h"

#include "blk-mq-tag.h"

#include "blk-wbt.h"



/*

block/blk-mq-sched.h

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


#include "elevator.h"

#include "blk-mq.h"

#include "blk-mq-tag.h"



#define MAX_SCHED_RQ (16 * BLKDEV_DEFAULT_RQ)