nvme: Rename NVME_NS_ADDED to NVME_NS_ALIVE and _CHANGED to _DELTA

NVME_NS_ADDED will conflict with a later change, so change it here.
Likewise NVME_NS_CHANGED.

Sponsored by:		Netflix

4 files changed, 7 insertions, 7 deletions

diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c
index 4737b2b03ae9..9250fb54c234 100644
--- a/sys/dev/nvd/nvd.c
+++ b/sys/dev/nvd/nvd.c
@@ -541,7 +541,7 @@ nvd_ns_changed(struct nvme_namespace *ns, void *ctrlr_arg)
 	struct nvd_disk		*ndisk;
 	struct nvd_controller	*ctrlr = ctrlr_arg;
 
-	if ((ns->flags & NVME_NS_CHANGED) == 0)
+	if ((ns->flags & NVME_NS_DELTA) == 0)
 		return (nvd_new_disk(ns, ctrlr_arg));
 
 	mtx_lock(&nvd_lock);
diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
index b09fa44b0329..cceff065fb2a 100644
--- a/sys/dev/nvme/nvme.h
+++ b/sys/dev/nvme/nvme.h
@@ -1927,8 +1927,8 @@ typedef void (*nvme_cons_fail_fn_t)(void *);
 enum nvme_namespace_flags {
 	NVME_NS_DEALLOCATE_SUPPORTED	= 0x01,
 	NVME_NS_FLUSH_SUPPORTED		= 0x02,
-	NVME_NS_ADDED			= 0x04,
-	NVME_NS_CHANGED			= 0x08,
+	NVME_NS_ALIVE			= 0x04,
+	NVME_NS_DELTA			= 0x08,
 	NVME_NS_GONE			= 0x10,
 };
 
diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
index 55b6d6b745cf..3d8b26d2004c 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -1230,10 +1230,10 @@ nvme_ctrlr_aer_task(void *arg, int pending)
 				break;
 
 			ns = &ctrlr->ns[id - 1];
-			ns->flags |= NVME_NS_CHANGED;
+			ns->flags |= NVME_NS_DELTA;
 			nvme_ns_construct(ns, id, ctrlr);
 			nvme_notify_ns(ctrlr, id);
-			ns->flags &= ~NVME_NS_CHANGED;
+			ns->flags &= ~NVME_NS_DELTA;
 		}
 	}
 
diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c
index b6611161a2b4..52d7e998198b 100644
--- a/sys/dev/nvme/nvme_ns.c
+++ b/sys/dev/nvme/nvme_ns.c
@@ -560,7 +560,7 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id,
 	 */
 	if (ns->data.nsze == 0) {
 		ns->flags |= NVME_NS_GONE;
-		return ((ns->flags & NVME_NS_ADDED) ? 0 : ENXIO);
+		return ((ns->flags & NVME_NS_ALIVE) ? 0 : ENXIO);
 	}
 
 	/*
@@ -623,7 +623,7 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id,
 	ns->cdev->si_drv2 = make_dev_alias(ns->cdev, "%sns%d",
 	    device_get_nameunit(ctrlr->dev), ns->id);
 	ns->cdev->si_flags |= SI_UNMAPPED;
-	ns->flags |= NVME_NS_ADDED;
+	ns->flags |= NVME_NS_ALIVE;
 
 	return (0);
 }