@@ -133,7 +133,7 @@ static const char *const blk_queue_flag_name[] = {
QUEUE_FLAG_NAME(SCSI_PASSTHROUGH),
QUEUE_FLAG_NAME(QUIESCED),
QUEUE_FLAG_NAME(PREEMPT_ONLY),
- QUEUE_FLAG_NAME(NO_SCHED),
+ QUEUE_FLAG_NAME(ADMIN),
};
#undef QUEUE_FLAG_NAME
@@ -2640,7 +2640,7 @@ struct request_queue *__blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
blk_mq_add_queue_tag_set(set, q);
blk_mq_map_swqueue(q);
- if (!blk_queue_no_sched(q)) {
+ if (!blk_queue_admin(q)) {
int ret;
ret = elevator_init_mq(q);
@@ -1108,7 +1108,7 @@ static int __elevator_change(struct request_queue *q, const char *name)
static inline bool elv_support_iosched(struct request_queue *q)
{
- if (q->mq_ops && blk_queue_no_sched(q))
+ if (q->mq_ops && blk_queue_admin(q))
return false;
return true;
}
@@ -1702,7 +1702,7 @@ static int null_add_dev(struct nullb_device *dev)
if (dev->queue_mode == NULL_Q_MQ) {
unsigned long q_flags = g_no_sched ?
- QUEUE_FLAG_MQ_NO_SCHED_DEFAULT : QUEUE_FLAG_MQ_DEFAULT;
+ QUEUE_FLAG_MQ_ADMIN_DEFAULT : QUEUE_FLAG_MQ_DEFAULT;
if (shared_tags) {
nullb->tag_set = &tag_set;
@@ -3041,7 +3041,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,
ctrl->ctrl.admin_tagset = &ctrl->admin_tag_set;
ctrl->ctrl.admin_q = __blk_mq_init_queue(&ctrl->admin_tag_set,
- QUEUE_FLAG_MQ_NO_SCHED_DEFAULT);
+ QUEUE_FLAG_MQ_ADMIN_DEFAULT);
if (IS_ERR(ctrl->ctrl.admin_q)) {
ret = PTR_ERR(ctrl->ctrl.admin_q);
goto out_free_admin_tag_set;
@@ -1491,7 +1491,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)
dev->ctrl.admin_tagset = &dev->admin_tagset;
dev->ctrl.admin_q = __blk_mq_init_queue(&dev->admin_tagset,
- QUEUE_FLAG_MQ_NO_SCHED_DEFAULT);
+ QUEUE_FLAG_MQ_ADMIN_DEFAULT);
if (IS_ERR(dev->ctrl.admin_q)) {
blk_mq_free_tag_set(&dev->admin_tagset);
return -ENOMEM;
@@ -770,7 +770,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl,
}
ctrl->ctrl.admin_q = __blk_mq_init_queue(&ctrl->admin_tag_set,
- QUEUE_FLAG_MQ_NO_SCHED_DEFAULT);
+ QUEUE_FLAG_MQ_ADMIN_DEFAULT);
if (IS_ERR(ctrl->ctrl.admin_q)) {
error = PTR_ERR(ctrl->ctrl.admin_q);
goto out_free_tagset;
@@ -381,7 +381,7 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl)
ctrl->ctrl.admin_tagset = &ctrl->admin_tag_set;
ctrl->ctrl.admin_q = __blk_mq_init_queue(&ctrl->admin_tag_set,
- QUEUE_FLAG_MQ_NO_SCHED_DEFAULT);
+ QUEUE_FLAG_MQ_ADMIN_DEFAULT);
if (IS_ERR(ctrl->ctrl.admin_q)) {
error = PTR_ERR(ctrl->ctrl.admin_q);
goto out_free_tagset;
@@ -699,7 +699,7 @@ struct request_queue {
#define QUEUE_FLAG_SCSI_PASSTHROUGH 27 /* queue supports SCSI commands */
#define QUEUE_FLAG_QUIESCED 28 /* queue has been quiesced */
#define QUEUE_FLAG_PREEMPT_ONLY 29 /* only process REQ_PREEMPT requests */
-#define QUEUE_FLAG_NO_SCHED 30 /* no scheduler allowed */
+#define QUEUE_FLAG_ADMIN 30 /* admin queue */
#define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \
(1 << QUEUE_FLAG_SAME_COMP) | \
@@ -709,8 +709,8 @@ struct request_queue {
(1 << QUEUE_FLAG_SAME_COMP) | \
(1 << QUEUE_FLAG_POLL))
-#define QUEUE_FLAG_MQ_NO_SCHED_DEFAULT (QUEUE_FLAG_MQ_DEFAULT | \
- (1 << QUEUE_FLAG_NO_SCHED))
+#define QUEUE_FLAG_MQ_ADMIN_DEFAULT (QUEUE_FLAG_MQ_DEFAULT | \
+ (1 << QUEUE_FLAG_ADMIN))
void blk_queue_flag_set(unsigned int flag, struct request_queue *q);
void blk_queue_flag_clear(unsigned int flag, struct request_queue *q);
@@ -743,7 +743,7 @@ bool blk_queue_flag_test_and_clear(unsigned int flag, struct request_queue *q);
#define blk_queue_preempt_only(q) \
test_bit(QUEUE_FLAG_PREEMPT_ONLY, &(q)->queue_flags)
#define blk_queue_fua(q) test_bit(QUEUE_FLAG_FUA, &(q)->queue_flags)
-#define blk_queue_no_sched(q) test_bit(QUEUE_FLAG_NO_SCHED, &(q)->queue_flags)
+#define blk_queue_admin(q) test_bit(QUEUE_FLAG_ADMIN, &(q)->queue_flags)
extern int blk_set_preempt_only(struct request_queue *q);
extern void blk_clear_preempt_only(struct request_queue *q);
Now all users of QUEUE_FLAG_NO_SCHED is for admin queue only, and not see any drivers need this flag for IO queue. So rename it as QUEUE_FLAG_ADMIN, which looks more straightforward. Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Christoph Hellwig <hch@lst.de> Cc: Bart Van Assche <bart.vanassche@wdc.com> Cc: Jianchao Wang <jianchao.w.wang@oracle.com> Cc: Hannes Reinecke <hare@suse.de> Cc: Johannes Thumshirn <jthumshirn@suse.de> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com> Cc: "Martin K. Petersen" <martin.petersen@oracle.com> Cc: linux-scsi@vger.kernel.org Signed-off-by: Ming Lei <ming.lei@redhat.com> --- block/blk-mq-debugfs.c | 2 +- block/blk-mq.c | 2 +- block/elevator.c | 2 +- drivers/block/null_blk_main.c | 2 +- drivers/nvme/host/fc.c | 2 +- drivers/nvme/host/pci.c | 2 +- drivers/nvme/host/rdma.c | 2 +- drivers/nvme/target/loop.c | 2 +- include/linux/blkdev.h | 8 ++++---- 9 files changed, 12 insertions(+), 12 deletions(-)