evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NVMe: Correct uses of INIT_WORK

Browse source 
We need to initialise the work_struct when we initialise the rest of the
struct nvme_dev, otherwise we'll hit a lockdep warning when we remove
the device.  Use PREPARE_WORK to change the function pointer instead
of INIT_WORK.

Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
This commit is contained in:
Matthew Wilcox 2014-01-29 09:33:52 -05:00
parent 3193f07bb7
commit bdfd70fde3
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/block/nvme-core.c
View file

@ -1075,7 +1075,7 @@ static void nvme_abort_cmd(int cmdid, struct nvme_queue *nvmeq)
dev_warn(&dev->pci_dev->dev, dev_warn(&dev->pci_dev->dev,
"I/O %d QID %d timeout, reset controller\n", cmdid, "I/O %d QID %d timeout, reset controller\n", cmdid,
nvmeq->qid); nvmeq->qid);
INIT_WORK(&dev->reset_work, nvme_reset_failed_dev); PREPARE_WORK(&dev->reset_work, nvme_reset_failed_dev);
queue_work(nvme_workq, &dev->reset_work); queue_work(nvme_workq, &dev->reset_work);
return; return;
} }
@ -1757,7 +1757,7 @@ static int nvme_kthread(void *data)
list_del_init(&dev->node); list_del_init(&dev->node);
dev_warn(&dev->pci_dev->dev, dev_warn(&dev->pci_dev->dev,
"Failed status, reset controller\n"); "Failed status, reset controller\n");
INIT_WORK(&dev->reset_work, PREPARE_WORK(&dev->reset_work,
nvme_reset_failed_dev); nvme_reset_failed_dev);
queue_work(nvme_workq, &dev->reset_work); queue_work(nvme_workq, &dev->reset_work);
continue; continue;
@ -2460,7 +2460,7 @@ static int nvme_dev_resume(struct nvme_dev *dev)
return ret; return ret;
if (ret == -EBUSY) { if (ret == -EBUSY) {
spin_lock(&dev_list_lock); spin_lock(&dev_list_lock);
INIT_WORK(&dev->reset_work, nvme_remove_disks); PREPARE_WORK(&dev->reset_work, nvme_remove_disks);
queue_work(nvme_workq, &dev->reset_work); queue_work(nvme_workq, &dev->reset_work);
spin_unlock(&dev_list_lock); spin_unlock(&dev_list_lock);
} }
@ -2507,6 +2507,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto free; goto free;
INIT_LIST_HEAD(&dev->namespaces); INIT_LIST_HEAD(&dev->namespaces);
INIT_WORK(&dev->reset_work, nvme_reset_failed_dev);
dev->pci_dev = pdev; dev->pci_dev = pdev;
pci_set_drvdata(pdev, dev); pci_set_drvdata(pdev, dev);
result = nvme_set_instance(dev); result = nvme_set_instance(dev);
@ -2605,7 +2606,7 @@ static int nvme_resume(struct device *dev)
struct nvme_dev *ndev = pci_get_drvdata(pdev); struct nvme_dev *ndev = pci_get_drvdata(pdev);
if (nvme_dev_resume(ndev) && !work_busy(&ndev->reset_work)) { if (nvme_dev_resume(ndev) && !work_busy(&ndev->reset_work)) {
INIT_WORK(&ndev->reset_work, nvme_reset_failed_dev); PREPARE_WORK(&ndev->reset_work, nvme_reset_failed_dev);
queue_work(nvme_workq, &ndev->reset_work); queue_work(nvme_workq, &ndev->reset_work);
} }
return 0; return 0;