summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2017-07-27 17:03:57 +0300
committerJens Axboe <axboe@kernel.dk>2017-07-29 18:00:03 +0300
commit18e9781d44000bcb403941011d954896df7439cc (patch)
tree8bc6c3cd5c5a2205f5440c810837bd1f9df8dfbc /block
parent33027c2bb53e33bdb7749d357da199cb54e8fb6f (diff)
downloadlinux-18e9781d44000bcb403941011d954896df7439cc.tar.xz
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: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/blk-mq.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 041f7b7fa0d6..b70a4ad78b63 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -620,11 +620,10 @@ static void blk_mq_requeue_work(struct work_struct *work)
container_of(work, struct request_queue, requeue_work.work);
LIST_HEAD(rq_list);
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);
- spin_unlock_irqrestore(&q->requeue_lock, flags);
+ spin_unlock_irq(&q->requeue_lock);
list_for_each_entry_safe(rq, next, &rq_list, queuelist) {
if (!(rq->rq_flags & RQF_SOFTBARRIER))