From nobody Fri Dec 5 23:18:22 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dNS3f3RxFz6JfXX for ; Fri, 05 Dec 2025 23:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNS3f1zJ9z4HpR for ; Fri, 05 Dec 2025 23:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764976702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kACfRtu/Hf3k8jms677SeYEAw0A2iT19QXhpv788FH8=; b=VzrRoFDtBViI8BOzFuQ8u0JaVj1F7FKrh1/JBExaRjexFJJ+H44KSbUV/WcAaTnxrC3PU2 zjR1JfIH9DRMxd70Ccw/wmg2kt5gD7FIiCag0z9lez7R8eWk81t380i2Q7hVVOwXsuT2Dx V7raqCIqHwFkEj8QOFnJ7CTDZATnRKztFJxiGi7mudbc6yS7TKFsqqR3P/ASUWbe4+ZAdN KE/GKpBOc1zotYQmKmFK+bEbpSo1mEwqhRAxtlyJyn87oIZPoZf6eCyVHXsHugCS4G3XGQ f12laEv7CXFbN2PuA7isSpkIYnMRCCCWPatKrrp2p48No3L8NN/uaPrH5RdMHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764976702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kACfRtu/Hf3k8jms677SeYEAw0A2iT19QXhpv788FH8=; b=N4qvLdRwXJsdIBD6UJYH8OZ4qpV8FoFTHpe/8PisPdi8VwLUNnJVw5DsSWrCKxxc4nLsGU qJlsvTHJSSIoJulbSYJkQ+9/T47pv4qQdw1dXM9H9YPKvs1LAv7d+LTFh4nNsvQ14b7Keu aWCmxyKkkob4qp04yPZvROi7JP4E6nAfqfZJlUcqTU9B1HGZktzk0KplshODKzjSXt6dTB bGkbY6WAPjVU3D3Aq16pc9/0oUqGx4gXEMSoUmSUDL92Z5d3NivewSoPz8YgqJf8YZpl6t 6otuYH+QeDjzI+hyLpjYRfR0JFvEYWdV29dhVp6I/jX3yAZ8GPJQ+Zhgk4Wl+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764976702; a=rsa-sha256; cv=none; b=kbwByzkSPLqJtwhCPtXi+13pETSlHAlcRWp/RqQmvEKIRgwL+bKxTtau4FVh/z3z9aLz0U 9IbaVmhWsecaYNcoEvqfGXFQR245Nmfw5HnqPAlZj9Xuy3KLQJJxlZURPmtb7WOnNmvSU4 TFc8U6EdzQF4K8al9TH4bCysx0WD2aKbrFwU+MMu8fbMj3S3ScsRzkuzYbbit+CofT1kz2 pVrIgXPpFsgs2hi/48KvRiFIBuW0XWeYyZHXhf97zc3TLpwcgXEGYerETTgzegEovRBXU8 R6dphlTuolVyzybn9C4cEkWL22dIDtnRN/KW5T29mH5NadxgdJ+0tDp01PrlaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dNS3f1QjXzWBP for ; Fri, 05 Dec 2025 23:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cd05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 23:18:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 10efa7c30209 - main - nvme: Rename NVME_NS_ADDED to NVME_NS_ALIVE and _CHANGED to _DELTA List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10efa7c3020909391255819bb38bd87478aa2b19 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 23:18:22 +0000 Message-Id: <6933683e.3cd05.e056c49@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=10efa7c3020909391255819bb38bd87478aa2b19 commit 10efa7c3020909391255819bb38bd87478aa2b19 Author: Warner Losh AuthorDate: 2025-12-05 23:17:53 +0000 Commit: Warner Losh 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); }