From nobody Mon Oct 19 06:24:45 2026 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 4j7QWK5JX9z6vsXq for ; Mon, 19 Oct 2026 06:24:45 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j7QWK2XCZz3Q7s for ; Mon, 19 Oct 2026 06:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792391085; 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=tHFR7WSDbL/WGCeTkhdhBaAIg3oBCA7g2td6DgExFyo=; b=Bxvirtap7C3HNvylB5ktdAVu5YDxM3b1ADLU/xIVf1RicUccLzuPQMK7ENPH0GxQ9SduA0 v29FWQskdWXKo3R8CpAiuNmcsVeEJVlB9au7yY38Da5Im8mGuP8OVELZSQbun1Q2HRC+g4 sCTzWYDpV9d0RDnlBaux58/21JqN/59TurTjMGIenKJoKxftgPtAewoIJLobv/zlxECja+ 0q5wFpGLfrChhlRkucyPRYH71Txcg81yaqXeV4kWK0pDPGSsY+9woiNChuREGfzuypjE79 hyO8EA89HO+e/gUGDFio9763kLzxPKWCP8usP47/T1F1xSe52bP8wjL8MVVKVA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792391085; b=xsQPAtuKdDQRZVT2dX15wBe/VabyGjZxnX8dzIq0FbSj1o+/sCLJ8p8cOT9R3a3On5N1Vz JnhA+ex1ghVGD1ASzl+j05LnVgSCozBUeyzv278eYEh0gUuo1Ubz7wlEIltU4/gwozTp6G aM45D64QpffTtAC70jD+2odN3Ld6Zbouj3Eof5yBtD1fLabhjxyWxCz1pnRuz6arfivi5I E0eu96ep7iqKkQUgrJpiy3FwKnsZwi7PkPthUQRnLvOmGR4agLOY8frE5w6G1ZLtmwRrTk ivwMtdDrXyITLSEFtpow6uhkG3fsedc6FtHCYbpj+LOxR4MTv9UhscEX4V+agg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792391085; 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=tHFR7WSDbL/WGCeTkhdhBaAIg3oBCA7g2td6DgExFyo=; b=R0kEAaIZJQwPORmZjT52y3maSKwdg/Z5WV9uF8uoSOEhtpKM0Lo1f7WVvTUreOmHmWa/a/ 00rUY27JzHWpCKahYY4Vs8GDN/mB5WOx3UEaUQMI4IKUIyi2fIrmcGMy+JveFD4IQZaiNT 7veqxeQbiAnVq8+g4HBlGwEj4S5kpZFipL/7eP758bG0F8jmIZjCx/7k59oUUgV+ZG+LfZ wqE4c+Ik2sYd+EwYyE37USv4W5JaMbexU4bYqCtaBkMjrcxDxOOmr+KZTreJUCsNPgQ7JT zmrvtvD9K8DT1l2uQoJa08dtbEY5fx60+W6wW2bqSQDs9hfvkpiWPCUaMWxcBA== 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 4j7QWK1LrMz1NY6 for ; Mon, 19 Oct 2026 06:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33b98 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Oct 2026 06:24:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ee96770ee375 - main - nvmecontrol: Fix mixup between pi and pil List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: ee96770ee37591d5fc9f7ee39aa1386636e8dc8d Auto-Submitted: auto-generated Date: Mon, 19 Oct 2026 06:24:45 +0000 Message-Id: <6ad5b7ad.33b98.356627b3@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ee96770ee37591d5fc9f7ee39aa1386636e8dc8d commit ee96770ee37591d5fc9f7ee39aa1386636e8dc8d Author: Warner Losh AuthorDate: 2026-10-19 06:19:17 +0000 Commit: Warner Losh CommitDate: 2026-10-19 06:22:51 +0000 nvmecontrol: Fix mixup between pi and pil pi and pil were extracted from the incorrect place. Swap how we get/set there to be correct. However, since these are always 0, this is a nop. --- sbin/nvmecontrol/format.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/nvmecontrol/format.c b/sbin/nvmecontrol/format.c index ccf0981103c0..71e557910654 100644 --- a/sbin/nvmecontrol/format.c +++ b/sbin/nvmecontrol/format.c @@ -165,9 +165,9 @@ check_controller_namespace(int fd, uint32_t nsid, uint32_t sector_size, ns_ms = opt.ms == NONE ? NVMEV(NVME_NS_DATA_FLBAS_EXTENDED, nsd.flbas) : opt.ms; ns_pi = opt.pi == NONE ? - NVMEV(NVME_NS_DATA_DPS_MD_START, nsd.dps) : opt.pi; + NVMEV(NVME_NS_DATA_DPS_PIT, nsd.dps) : opt.pi; ns_pil = opt.pil == NONE ? - NVMEV(NVME_NS_DATA_DPS_PIT, nsd.dps) : opt.pil; + NVMEV(NVME_NS_DATA_DPS_MD_START, nsd.dps) : opt.pil; if (!*found) { *lbaf = fmt; *ms = ns_ms; @@ -274,9 +274,9 @@ format(const struct cmd *f, int argc, char *argv[]) if (ms < 0) ms = NVMEV(NVME_NS_DATA_FLBAS_EXTENDED, nsd.flbas); if (pi < 0) - pi = NVMEV(NVME_NS_DATA_DPS_MD_START, nsd.dps); + pi = NVMEV(NVME_NS_DATA_DPS_PIT, nsd.dps); if (pil < 0) - pil = NVMEV(NVME_NS_DATA_DPS_PIT, nsd.dps); + pil = NVMEV(NVME_NS_DATA_DPS_MD_START, nsd.dps); } else { /* We have no previous parameters, so default to zeroes. */