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

Commit 18e9781d authored by Jens Axboe's avatar Jens Axboe
Browse files

blk-mq: blk_mq_requeue_work() doesn't need to save IRQ flags 



We know we're in process context, so don't bother using the
IRQ safe versions of the spin lock.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 33027c2b

block/blk-mq.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -620,11 +620,10 @@ static void blk_mq_requeue_work(struct work_struct *work) 
		container_of(work, struct request_queue, requeue_work.work);

		container_of(work, struct request_queue, requeue_work.work);

	LIST_HEAD(rq_list);

	LIST_HEAD(rq_list);

	struct request *rq, *next;

	struct request *rq, *next;

	unsigned long flags;





	spin_lock_irqsave(&q->requeue_lock, flags);

	spin_lock_irq(&q->requeue_lock);

	list_splice_init(&q->requeue_list, &rq_list);

	list_splice_init(&q->requeue_list, &rq_list);

	spin_unlock_irqrestore(&q->requeue_lock, flags);

	spin_unlock_irq(&q->requeue_lock);





	list_for_each_entry_safe(rq, next, &rq_list, queuelist) {

	list_for_each_entry_safe(rq, next, &rq_list, queuelist) {

		if (!(rq->rq_flags & RQF_SOFTBARRIER))

		if (!(rq->rq_flags & RQF_SOFTBARRIER))