Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: block: Remove RQF_PREEMPT and BLK_MQ_REQ_PREEMPT

Remove flag RQF_PREEMPT and BLK_MQ_REQ_PREEMPT since these are no longer
used by any kernel code.

Link: https://lore.kernel.org/r/20201209052951.16136-8-bvanassche@acm.org
Cc: Can Guo <cang@codeaurora.org>
Cc: Stanley Chu <stanley.chu@mediatek.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Martin Kepplinger <martin.kepplinger@puri.sm>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Bart Van Assche and committed by
Martin K. Petersen
a4d34da7 e6044f71

+4 -14
+3 -4
block/blk-core.c
··· 424 424 /** 425 425 * blk_queue_enter() - try to increase q->q_usage_counter 426 426 * @q: request queue pointer 427 - * @flags: BLK_MQ_REQ_NOWAIT, BLK_MQ_REQ_PM and/or BLK_MQ_REQ_PREEMPT 427 + * @flags: BLK_MQ_REQ_NOWAIT and/or BLK_MQ_REQ_PM 428 428 */ 429 429 int blk_queue_enter(struct request_queue *q, blk_mq_req_flags_t flags) 430 430 { 431 - const bool pm = flags & (BLK_MQ_REQ_PM | BLK_MQ_REQ_PREEMPT); 431 + const bool pm = flags & BLK_MQ_REQ_PM; 432 432 433 433 while (true) { 434 434 bool success = false; ··· 630 630 struct request *req; 631 631 632 632 WARN_ON_ONCE(op & REQ_NOWAIT); 633 - WARN_ON_ONCE(flags & ~(BLK_MQ_REQ_NOWAIT | BLK_MQ_REQ_PM | 634 - BLK_MQ_REQ_PREEMPT)); 633 + WARN_ON_ONCE(flags & ~(BLK_MQ_REQ_NOWAIT | BLK_MQ_REQ_PM)); 635 634 636 635 req = blk_mq_alloc_request(q, op, flags); 637 636 if (!IS_ERR(req) && q->mq_ops->initialize_rq_fn)
-1
block/blk-mq-debugfs.c
··· 297 297 RQF_NAME(MIXED_MERGE), 298 298 RQF_NAME(MQ_INFLIGHT), 299 299 RQF_NAME(DONTPREP), 300 - RQF_NAME(PREEMPT), 301 300 RQF_NAME(FAILED), 302 301 RQF_NAME(QUIET), 303 302 RQF_NAME(ELVPRIV),
-2
block/blk-mq.c
··· 294 294 rq->cmd_flags = data->cmd_flags; 295 295 if (data->flags & BLK_MQ_REQ_PM) 296 296 rq->rq_flags |= RQF_PM; 297 - if (data->flags & BLK_MQ_REQ_PREEMPT) 298 - rq->rq_flags |= RQF_PREEMPT; 299 297 if (blk_queue_io_stat(data->q)) 300 298 rq->rq_flags |= RQF_IO_STAT; 301 299 INIT_LIST_HEAD(&rq->queuelist);
-2
include/linux/blk-mq.h
··· 446 446 BLK_MQ_REQ_RESERVED = (__force blk_mq_req_flags_t)(1 << 1), 447 447 /* set RQF_PM */ 448 448 BLK_MQ_REQ_PM = (__force blk_mq_req_flags_t)(1 << 2), 449 - /* set RQF_PREEMPT */ 450 - BLK_MQ_REQ_PREEMPT = (__force blk_mq_req_flags_t)(1 << 3), 451 449 }; 452 450 453 451 struct request *blk_mq_alloc_request(struct request_queue *q, unsigned int op,
+1 -5
include/linux/blkdev.h
··· 79 79 #define RQF_MQ_INFLIGHT ((__force req_flags_t)(1 << 6)) 80 80 /* don't call prep for this one */ 81 81 #define RQF_DONTPREP ((__force req_flags_t)(1 << 7)) 82 - /* set for "ide_preempt" requests and also for requests for which the SCSI 83 - "quiesce" state must be ignored. */ 84 - #define RQF_PREEMPT ((__force req_flags_t)(1 << 8)) 85 82 /* vaguely specified driver internal error. Ignored by the block layer */ 86 83 #define RQF_FAILED ((__force req_flags_t)(1 << 10)) 87 84 /* don't warn about errors */ ··· 427 430 unsigned long queue_flags; 428 431 /* 429 432 * Number of contexts that have called blk_set_pm_only(). If this 430 - * counter is above zero then only RQF_PM and RQF_PREEMPT requests are 431 - * processed. 433 + * counter is above zero then only RQF_PM requests are processed. 432 434 */ 433 435 atomic_t pm_only; 434 436