Commit e6b09a17 authored by Jens Axboe's avatar Jens Axboe
Browse files

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()
parents 81475beb fe017513

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/nvme/host/nvme.h

+0 −1
Original line number Diff line number Diff line
@@ -301,7 +301,6 @@ struct nvme_ctrl { 


	struct opal_dev *opal_dev;



	char name[12];

	u16 cntlid;



	u16 mtfa;