lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NVMe: Fix lockdep warnings

Browse Source 
During the initialisation path, the queue lock is taken without interrupt
protection.  It's perfectly safe to do so, because the interrupt handler
can't run at this point, but it confuses lockdep.

Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
This commit is contained in:
Matthew Wilcox 2013-10-15 15:01:10 -04:00 committed by Matthew Wilcox
parent 320a382746
commit 0a8d44cb33
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/block/nvme-core.c
View File

@ -1172,9 +1172,9 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid)
if (result < 0) if (result < 0)
goto release_sq; goto release_sq;
spin_lock(&nvmeq->q_lock); spin_lock_irq(&nvmeq->q_lock);
nvme_init_queue(nvmeq, qid); nvme_init_queue(nvmeq, qid);
spin_unlock(&nvmeq->q_lock); spin_unlock_irq(&nvmeq->q_lock);
return result; return result;
@ -1290,9 +1290,9 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev)
if (result) if (result)
return result; return result;
spin_lock(&nvmeq->q_lock); spin_lock_irq(&nvmeq->q_lock);
nvme_init_queue(nvmeq, 0); nvme_init_queue(nvmeq, 0);
spin_unlock(&nvmeq->q_lock); spin_unlock_irq(&nvmeq->q_lock);
return result; return result;
} }
@ -1836,9 +1836,9 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
for (i = dev->queue_count - 1; i > nr_io_queues; i--) { for (i = dev->queue_count - 1; i > nr_io_queues; i--) {
struct nvme_queue *nvmeq = dev->queues[i]; struct nvme_queue *nvmeq = dev->queues[i];
spin_lock(&nvmeq->q_lock); spin_lock_irq(&nvmeq->q_lock);
nvme_cancel_ios(nvmeq, false); nvme_cancel_ios(nvmeq, false);
spin_unlock(&nvmeq->q_lock); spin_unlock_irq(&nvmeq->q_lock);
nvme_free_queue(nvmeq); nvme_free_queue(nvmeq);
dev->queue_count--; dev->queue_count--;