Date: Fri, 05 Dec 2025 23:18:22 +0000 From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 10efa7c30209 - main - nvme: Rename NVME_NS_ADDED to NVME_NS_ALIVE and _CHANGED to _DELTA Message-ID: <6933683e.3cd05.e056c49@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=10efa7c3020909391255819bb38bd87478aa2b19 commit 10efa7c3020909391255819bb38bd87478aa2b19 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2025-12-05 23:17:53 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2025-12-05 23:18:12 +0000 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 --- sys/dev/nvd/nvd.c | 2 +- sys/dev/nvme/nvme.h | 4 ++-- sys/dev/nvme/nvme_ctrlr.c | 4 ++-- sys/dev/nvme/nvme_ns.c | 4 ++-- 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); }help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6933683e.3cd05.e056c49>