Commit 41353fba authored by Guixin Liu's avatar Guixin Liu Committed by Keith Busch
Browse files

nvmet: unify aer type enum 



The host and target use two definition of aer type, unify
them into a single one.

Signed-off-by: default avatarGuixin Liu <kanie@linux.alibaba.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 13f3956e

drivers/nvme/target/core.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -816,12 +816,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 {