summaryrefslogtreecommitdiffstats
path: root/include/linux/nvme.h
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2015-10-02 10:37:29 -0600
committerJens Axboe <axboe@fb.com>2015-10-09 10:40:36 -0600
commit0a7385ad69f0f210c5cfbfd334b42423a6e05e5a (patch)
tree676c0f49cf661bbcb65455a0a5a739acf4e745e9 /include/linux/nvme.h
parent5105aa555c1c681ae281ea0d6108efd0a5d8a5e8 (diff)
downloadop-kernel-dev-0a7385ad69f0f210c5cfbfd334b42423a6e05e5a.zip
op-kernel-dev-0a7385ad69f0f210c5cfbfd334b42423a6e05e5a.tar.gz
NVMe: Simplify device resume on io queue failure
Releasing IO queues and disks was done in a work queue outside the controller resume context to delete namespaces if the controller failed after a resume from suspend. This is unnecessary since we can resume a device asynchronously. This patch makes resume use probe_work so it can directly remove namespaces if the device is manageable but not IO capable. Since the deleting disks was the only reason we had the convoluted "reset_workfn", this patch removes that unnecessary indirection. Signed-off-by: Keith Busch <keith.busch@intel.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/nvme.h')
-rw-r--r--include/linux/nvme.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 992b9c1..7725b4c 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -104,7 +104,6 @@ struct nvme_dev {
struct list_head namespaces;
struct kref kref;
struct device *device;
- work_func_t reset_workfn;
struct work_struct reset_work;
struct work_struct probe_work;
struct work_struct scan_work;
OpenPOWER on IntegriCloud