Commit e743eb1e authored by Jens Axboe's avatar Jens Axboe
Browse files

block: remove unused syncfull/asyncfull queue flags 



We haven't used these in years, but somehow the definitions still
remained. Kill them, and renumber the QUEUE_FLAG_ space. We had
a hole in the beginning of the space, too.

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

block/blk-mq-debugfs.c

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ static int blk_flags_show(struct seq_file *m, const unsigned long flags, 
static const char *const blk_queue_flag_name[] = {

	QUEUE_FLAG_NAME(QUEUED),

	QUEUE_FLAG_NAME(STOPPED),

	QUEUE_FLAG_NAME(SYNCFULL),

	QUEUE_FLAG_NAME(ASYNCFULL),

	QUEUE_FLAG_NAME(DYING),

	QUEUE_FLAG_NAME(BYPASS),

	QUEUE_FLAG_NAME(BIDI),

include/linux/blkdev.h

+29 −31
Original line number Diff line number Diff line
@@ -601,38 +601,36 @@ struct request_queue { 
	u64			write_hints[BLK_MAX_WRITE_HINTS];

};



#define QUEUE_FLAG_QUEUED	1	/* uses generic tag queueing */

#define QUEUE_FLAG_STOPPED	2	/* queue is stopped */

#define	QUEUE_FLAG_SYNCFULL	3	/* read queue has been filled */

#define QUEUE_FLAG_ASYNCFULL	4	/* write queue has been filled */

#define QUEUE_FLAG_DYING	5	/* queue being torn down */

#define QUEUE_FLAG_BYPASS	6	/* act as dumb FIFO queue */

#define QUEUE_FLAG_BIDI		7	/* queue supports bidi requests */

#define QUEUE_FLAG_NOMERGES     8	/* disable merge attempts */

#define QUEUE_FLAG_SAME_COMP	9	/* complete on same CPU-group */

#define QUEUE_FLAG_FAIL_IO     10	/* fake timeout */

#define QUEUE_FLAG_STACKABLE   11	/* supports request stacking */

#define QUEUE_FLAG_NONROT      12	/* non-rotational device (SSD) */

#define QUEUE_FLAG_QUEUED	0	/* uses generic tag queueing */

#define QUEUE_FLAG_STOPPED	1	/* queue is stopped */

#define QUEUE_FLAG_DYING	2	/* queue being torn down */

#define QUEUE_FLAG_BYPASS	3	/* act as dumb FIFO queue */

#define QUEUE_FLAG_BIDI		4	/* queue supports bidi requests */

#define QUEUE_FLAG_NOMERGES     5	/* disable merge attempts */

#define QUEUE_FLAG_SAME_COMP	6	/* complete on same CPU-group */

#define QUEUE_FLAG_FAIL_IO	7	/* fake timeout */

#define QUEUE_FLAG_STACKABLE	8	/* supports request stacking */

#define QUEUE_FLAG_NONROT	9	/* non-rotational device (SSD) */

#define QUEUE_FLAG_VIRT        QUEUE_FLAG_NONROT /* paravirt device */

#define QUEUE_FLAG_IO_STAT     13	/* do IO stats */

#define QUEUE_FLAG_DISCARD     14	/* supports DISCARD */

#define QUEUE_FLAG_NOXMERGES   15	/* No extended merges */

#define QUEUE_FLAG_ADD_RANDOM  16	/* Contributes to random pool */

#define QUEUE_FLAG_SECERASE    17	/* supports secure erase */

#define QUEUE_FLAG_SAME_FORCE  18	/* force complete on same CPU */

#define QUEUE_FLAG_DEAD        19	/* queue tear-down finished */

#define QUEUE_FLAG_INIT_DONE   20	/* queue is initialized */

#define QUEUE_FLAG_NO_SG_MERGE 21	/* don't attempt to merge SG segments*/

#define QUEUE_FLAG_POLL	       22	/* IO polling enabled if set */

#define QUEUE_FLAG_WC	       23	/* Write back caching */

#define QUEUE_FLAG_FUA	       24	/* device supports FUA writes */

#define QUEUE_FLAG_FLUSH_NQ    25	/* flush not queueuable */

#define QUEUE_FLAG_DAX         26	/* device supports DAX */

#define QUEUE_FLAG_STATS       27	/* track rq completion times */

#define QUEUE_FLAG_POLL_STATS  28	/* collecting stats for hybrid polling */

#define QUEUE_FLAG_REGISTERED  29	/* queue has been registered to a disk */

#define QUEUE_FLAG_SCSI_PASSTHROUGH 30	/* queue supports SCSI commands */

#define QUEUE_FLAG_QUIESCED    31	/* queue has been quiesced */

#define QUEUE_FLAG_IO_STAT     10	/* do IO stats */

#define QUEUE_FLAG_DISCARD     11	/* supports DISCARD */

#define QUEUE_FLAG_NOXMERGES   12	/* No extended merges */

#define QUEUE_FLAG_ADD_RANDOM  13	/* Contributes to random pool */

#define QUEUE_FLAG_SECERASE    14	/* supports secure erase */

#define QUEUE_FLAG_SAME_FORCE  15	/* force complete on same CPU */

#define QUEUE_FLAG_DEAD        16	/* queue tear-down finished */

#define QUEUE_FLAG_INIT_DONE   17	/* queue is initialized */

#define QUEUE_FLAG_NO_SG_MERGE 18	/* don't attempt to merge SG segments*/

#define QUEUE_FLAG_POLL	       19	/* IO polling enabled if set */

#define QUEUE_FLAG_WC	       20	/* Write back caching */

#define QUEUE_FLAG_FUA	       21	/* device supports FUA writes */

#define QUEUE_FLAG_FLUSH_NQ    22	/* flush not queueuable */

#define QUEUE_FLAG_DAX         23	/* device supports DAX */

#define QUEUE_FLAG_STATS       24	/* track rq completion times */

#define QUEUE_FLAG_POLL_STATS  25	/* collecting stats for hybrid polling */

#define QUEUE_FLAG_REGISTERED  26	/* queue has been registered to a disk */

#define QUEUE_FLAG_SCSI_PASSTHROUGH 27	/* queue supports SCSI commands */

#define QUEUE_FLAG_QUIESCED    28	/* queue has been quiesced */



#define QUEUE_FLAG_DEFAULT	((1 << QUEUE_FLAG_IO_STAT) |		\

				 (1 << QUEUE_FLAG_STACKABLE)	|	\