superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "block: Provide blk_mq_sched_get_icq()" 

This reverts commit 4896c4e64ba5d5d5acdbcf68c5910dd4f6d8fa62.

The helper is not needed any more.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211126115817.2087431-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
pull/78/merge
Christoph Hellwig 2021-11-26 12:58:08 +01:00 committed by Jens Axboe
parent a0725c22cd
commit c2a32464f4
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
block/blk-mq-sched.c
View File

@ -18,8 +18,9 @@
#include "blk-mq-tag.h" #include "blk-mq-tag.h"
#include "blk-wbt.h" #include "blk-wbt.h"
struct io_cq *blk_mq_sched_get_icq(struct request_queue *q) void blk_mq_sched_assign_ioc(struct request *rq)
{ {
struct request_queue *q = rq->q;
struct io_context *ioc; struct io_context *ioc;
struct io_cq *icq; struct io_cq *icq;
@ -27,27 +28,22 @@ struct io_cq *blk_mq_sched_get_icq(struct request_queue *q)
if (unlikely(!current->io_context)) if (unlikely(!current->io_context))
create_task_io_context(current, GFP_ATOMIC, q->node); create_task_io_context(current, GFP_ATOMIC, q->node);
/* May not have an IO context if context creation failed */ /*
* May not have an IO context if it's a passthrough request
*/
ioc = current->io_context; ioc = current->io_context;
if (!ioc) if (!ioc)
return NULL; return;
spin_lock_irq(&q->queue_lock); spin_lock_irq(&q->queue_lock);
icq = ioc_lookup_icq(ioc, q); icq = ioc_lookup_icq(ioc, q);
spin_unlock_irq(&q->queue_lock); spin_unlock_irq(&q->queue_lock);
if (icq)
return icq;
return ioc_create_icq(ioc, q, GFP_ATOMIC);
}
EXPORT_SYMBOL(blk_mq_sched_get_icq);
void blk_mq_sched_assign_ioc(struct request *rq) if (!icq) {
{ icq = ioc_create_icq(ioc, q, GFP_ATOMIC);
struct io_cq *icq;
icq = blk_mq_sched_get_icq(rq->q);
if (!icq) if (!icq)
return; return;
}
get_io_context(icq->ioc); get_io_context(icq->ioc);
rq->elv.icq = icq; rq->elv.icq = icq;
} }

1
block/blk-mq-sched.h
View File

@ -8,7 +8,6 @@
#define MAX_SCHED_RQ (16 * BLKDEV_DEFAULT_RQ) #define MAX_SCHED_RQ (16 * BLKDEV_DEFAULT_RQ)
struct io_cq *blk_mq_sched_get_icq(struct request_queue *q);
void blk_mq_sched_assign_ioc(struct request *rq); void blk_mq_sched_assign_ioc(struct request *rq);
bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio, bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,