diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-08-22 16:20:24 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-08-22 16:20:24 -0600 |
| commit | e6b09a173870720e4d4c6fd755803970015ac043 (patch) | |
| tree | 69882646b3b070122e87c232fda1571bc9452bf1 | |
| parent | 81475beb1b5996505a39cd1d9316ce1e668932a2 (diff) | |
| parent | fe01751347359862c65c715d51c0b3f4fa8ee2f0 (diff) | |
Merge tag 'nvme-6.11-2024-08-22' of git://git.infradead.org/nvme into block-6.11
Pull NVMe fixes from Keith:
"nvme fixes for Linux 6.11
- Remove unused struct field (Nilay)
- Fix fabrics keep-alive teardown order (Ming)"
* tag 'nvme-6.11-2024-08-22' of git://git.infradead.org/nvme:
nvme: Remove unused field
nvme: move stopping keep-alive into nvme_uninit_ctrl()
| -rw-r--r-- | drivers/nvme/host/core.c | 2 | ||||
| -rw-r--r-- | drivers/nvme/host/nvme.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 33fa01c599ad..0dc8bcc664f2 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -4612,7 +4612,6 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl) { nvme_mpath_stop(ctrl); nvme_auth_stop(ctrl); - nvme_stop_keep_alive(ctrl); nvme_stop_failfast_work(ctrl); flush_work(&ctrl->async_event_work); cancel_work_sync(&ctrl->fw_act_work); @@ -4648,6 +4647,7 @@ EXPORT_SYMBOL_GPL(nvme_start_ctrl); void nvme_uninit_ctrl(struct nvme_ctrl *ctrl) { + nvme_stop_keep_alive(ctrl); nvme_hwmon_exit(ctrl); nvme_fault_inject_fini(&ctrl->fault_inject); dev_pm_qos_hide_latency_tolerance(ctrl->device); diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index ae5314d32943..da57947130cc 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -301,7 +301,6 @@ struct nvme_ctrl { struct opal_dev *opal_dev; - char name[12]; u16 cntlid; u16 mtfa; |