Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea511e3c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: remove blk_mq_sched_{get,put}_rq_priv 



Having these as separate helpers in a header really does not help
readability, or my chances to refactor this code sanely.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d2c0d383

block/blk-mq-sched.c

+6 −4
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ static void __blk_mq_sched_assign_ioc(struct request_queue *q, 
				      struct bio *bio,

				      struct io_context *ioc)

{

	struct elevator_queue *e = q->elevator;

	struct io_cq *icq;



	spin_lock_irq(q->queue_lock);
@@ -49,13 +50,14 @@ static void __blk_mq_sched_assign_ioc(struct request_queue *q, 
	}



	rq->elv.icq = icq;

	if (!blk_mq_sched_get_rq_priv(q, rq, bio)) {

		rq->rq_flags |= RQF_ELVPRIV;

		get_io_context(icq->ioc);

	if (e && e->type->ops.mq.get_rq_priv &&

	    e->type->ops.mq.get_rq_priv(q, rq, bio)) {

		rq->elv.icq = NULL;

		return;

	}



	rq->elv.icq = NULL;

	rq->rq_flags |= RQF_ELVPRIV;

	get_io_context(icq->ioc);

}



void blk_mq_sched_assign_ioc(struct request_queue *q, struct request *rq,

block/blk-mq-sched.h

+0 −21
Original line number Diff line number Diff line
@@ -44,27 +44,6 @@ blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio) 
	return __blk_mq_sched_bio_merge(q, bio);

}



static inline int blk_mq_sched_get_rq_priv(struct request_queue *q,

					   struct request *rq,

					   struct bio *bio)

{

	struct elevator_queue *e = q->elevator;



	if (e && e->type->ops.mq.get_rq_priv)

		return e->type->ops.mq.get_rq_priv(q, rq, bio);



	return 0;

}



static inline void blk_mq_sched_put_rq_priv(struct request_queue *q,

					    struct request *rq)

{

	struct elevator_queue *e = q->elevator;



	if (e && e->type->ops.mq.put_rq_priv)

		e->type->ops.mq.put_rq_priv(q, rq);

}



static inline bool

blk_mq_sched_allow_merge(struct request_queue *q, struct request *rq,

			 struct bio *bio)

block/blk-mq.c

+2 −1
Original line number Diff line number Diff line
@@ -438,7 +438,8 @@ void blk_mq_free_request(struct request *rq) 
	struct elevator_queue *e = q->elevator;



	if (rq->rq_flags & RQF_ELVPRIV) {

		blk_mq_sched_put_rq_priv(rq->q, rq);

		if (e && e->type->ops.mq.put_rq_priv)

			e->type->ops.mq.put_rq_priv(q, rq);

		if (rq->elv.icq) {

			put_io_context(rq->elv.icq->ioc);

			rq->elv.icq = NULL;