nvmet: unify aer type enum
Subsystems (2)
PATCH 1/1 nvmet: unify aer type enum
The host and target use two definition of aer type, unify them into a single one.
Signed-off-by Guixin Liu <[email protected]>
--- drivers/nvme/target/core.c | 4 ++-- drivers/nvme/target/discovery.c | 2 +- include/linux/nvme.h | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-)
drivers/nvme/target/core.c +2 -2
@@ -248,7 +248,7 @@ void nvmet_ns_changed(struct nvmet_subsys *subsys, u32 nsid)nvmet_add_to_changed_ns_log (ctrl,cpu_to_le32 (nsid));if (nvmet_aen_bit_disabled (ctrl,NVME_AEN_BIT_NS_ATTR ))continue ; -nvmet_add_async_event (ctrl,NVME_AER_TYPE_NOTICE , +nvmet_add_async_event (ctrl,NVME_AER_NOTICE ,NVME_AER_NOTICE_NS_CHANGED ,NVME_LOG_CHANGED_NS ); }
@@ -265,7 +265,7 @@ void nvmet_send_ana_event(struct nvmet_subsys *subsys,continue ;if (nvmet_aen_bit_disabled (ctrl,NVME_AEN_BIT_ANA_CHANGE ))continue ; -nvmet_add_async_event (ctrl,NVME_AER_TYPE_NOTICE , +nvmet_add_async_event (ctrl,NVME_AER_NOTICE ,NVME_AER_NOTICE_ANA ,NVME_LOG_ANA ); }mutex_unlock (&subsys->lock);
drivers/nvme/target/discovery.c +1 -1
@@ -21,7 +21,7 @@ static void __nvmet_disc_changed(struct nvmet_port *port,if (nvmet_aen_bit_disabled (ctrl,NVME_AEN_BIT_DISC_CHANGE ))return ; -nvmet_add_async_event (ctrl,NVME_AER_TYPE_NOTICE , +nvmet_add_async_event (ctrl,NVME_AER_NOTICE ,NVME_AER_NOTICE_DISC_CHANGED ,NVME_LOG_DISC ); }
include/linux/nvme.h +0 -6
@@ -865,12 +865,6 @@ struct nvme_reservation_status_ext {struct nvme_registered_ctrl_ext regctl_eds[]; }; -enum nvme_async_event_type { -NVME_AER_TYPE_ERROR =0 , -NVME_AER_TYPE_SMART =1 , -NVME_AER_TYPE_NOTICE =2 , -}; -/* I/O commands */ enum nvme_opcode {
Signature · 1 line
2.43.0
Reviewed-by Sagi Grimberg <[email protected]>
Sagi Grimberg
maintainerResending... didn't make it to the list, probably smtp issues....
Quoted 1 line · Sagi Grimberg
Reviewed-by Sagi Grimberg <[email protected]>
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
Applied to nvme-6.8, thanks.