History

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.

Bart Van Assche committed 5 years ago

Commit a4d34da1 parent e6044f75 files · +4 −14Browse files

Unified · Split

5 files
  1. block/blk-core.c +3 −4
  2. block/blk-mq-debugfs.c +0 −1
  3. block/blk-mq.c +0 −2
  4. include/linux/blk-mq.h +0 −2
  5. include/linux/blkdev.h +1 −5
block/blk-core.c+3−4
@@ -424,11 +424,11 @@ EXPORT_SYMBOL(blk_cleanup_queue); · 423 unmodified lines
424/**424/**
425 * blk_queue_enter() - try to increase q->q_usage_counter425 * blk_queue_enter() - try to increase q->q_usage_counter
426 * @q: request queue pointer426 * @q: request queue pointer
427 * @flags: BLK_MQ_REQ_NOWAIT, BLK_MQ_REQ_PM and/or BLK_MQ_REQ_PREEMPT427 * @flags: BLK_MQ_REQ_NOWAIT and/or BLK_MQ_REQ_PM
428 */428 */
429int blk_queue_enter(struct request_queue *q, blk_mq_req_flags_t flags)429int 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 while (true) {433 while (true) {
434 bool success = false;434 bool success = false;
@@ -630,8 +630,7 @@ struct request *blk_get_request(struct request_queue *q, unsigned int op, · 195 unmodified lines
630 struct request *req;630 struct request *req;
631 631
632 WARN_ON_ONCE(op & REQ_NOWAIT);632 WARN_ON_ONCE(op & REQ_NOWAIT);
633 WARN_ON_ONCE(flags & ~(BLK_MQ_REQ_NOWAIT | BLK_MQ_REQ_PM |633 WARN_ON_ONCE(flags & ~(BLK_MQ_REQ_NOWAIT | BLK_MQ_REQ_PM));
634 BLK_MQ_REQ_PREEMPT));
635 634
636 req = blk_mq_alloc_request(q, op, flags);635 req = blk_mq_alloc_request(q, op, flags);
637 if (!IS_ERR(req) && q->mq_ops->initialize_rq_fn)636 if (!IS_ERR(req) && q->mq_ops->initialize_rq_fn)
block/blk-mq-debugfs.c+0−1
@@ -297,7 +297,6 @@ static const char *const rqf_name[] = { · 296 unmodified lines
297 RQF_NAME(MIXED_MERGE),297 RQF_NAME(MIXED_MERGE),
298 RQF_NAME(MQ_INFLIGHT),298 RQF_NAME(MQ_INFLIGHT),
299 RQF_NAME(DONTPREP),299 RQF_NAME(DONTPREP),
300 RQF_NAME(PREEMPT),
301 RQF_NAME(FAILED),300 RQF_NAME(FAILED),
302 RQF_NAME(QUIET),301 RQF_NAME(QUIET),
303 RQF_NAME(ELVPRIV),302 RQF_NAME(ELVPRIV),
block/blk-mq.c+0−2
@@ -294,8 +294,6 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data, · 293 unmodified lines
294 rq->cmd_flags = data->cmd_flags;294 rq->cmd_flags = data->cmd_flags;
295 if (data->flags & BLK_MQ_REQ_PM)295 if (data->flags & BLK_MQ_REQ_PM)
296 rq->rq_flags |= RQF_PM;296 rq->rq_flags |= RQF_PM;
297 if (data->flags & BLK_MQ_REQ_PREEMPT)
298 rq->rq_flags |= RQF_PREEMPT;
299 if (blk_queue_io_stat(data->q))297 if (blk_queue_io_stat(data->q))
300 rq->rq_flags |= RQF_IO_STAT;298 rq->rq_flags |= RQF_IO_STAT;
301 INIT_LIST_HEAD(&rq->queuelist);299 INIT_LIST_HEAD(&rq->queuelist);
include/linux/blk-mq.h+0−2
@@ -446,8 +446,6 @@ enum { · 445 unmodified lines
446 BLK_MQ_REQ_RESERVED = (__force blk_mq_req_flags_t)(1 << 1),446 BLK_MQ_REQ_RESERVED = (__force blk_mq_req_flags_t)(1 << 1),
447 /* set RQF_PM */447 /* set RQF_PM */
448 BLK_MQ_REQ_PM = (__force blk_mq_req_flags_t)(1 << 2),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
453struct request *blk_mq_alloc_request(struct request_queue *q, unsigned int op,451struct request *blk_mq_alloc_request(struct request_queue *q, unsigned int op,
include/linux/blkdev.h+1−5
@@ -79,9 +79,6 @@ typedef __u32 __bitwise req_flags_t; · 78 unmodified lines
79#define RQF_MQ_INFLIGHT ((__force req_flags_t)(1 << 6))79#define RQF_MQ_INFLIGHT ((__force req_flags_t)(1 << 6))
80/* don't call prep for this one */80/* don't call prep for this one */
81#define RQF_DONTPREP ((__force req_flags_t)(1 << 7))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/* vaguely specified driver internal error. Ignored by the block layer */82/* vaguely specified driver internal error. Ignored by the block layer */
86#define RQF_FAILED ((__force req_flags_t)(1 << 10))83#define RQF_FAILED ((__force req_flags_t)(1 << 10))
87/* don't warn about errors */84/* don't warn about errors */
@@ -430,8 +427,7 @@ struct request_queue { · 342 unmodified lines
430 unsigned long queue_flags;427 unsigned long queue_flags;
431 /*428 /*
432 * Number of contexts that have called blk_set_pm_only(). If this429 * Number of contexts that have called blk_set_pm_only(). If this
433 * counter is above zero then only RQF_PM and RQF_PREEMPT requests are430 * counter is above zero then only RQF_PM requests are processed.
434 * processed.
435 */431 */
436 atomic_t pm_only;432 atomic_t pm_only;
437 433