From nobody Wed Mar 1 18:47:34 2023 X-Original-To: dev-commits-src-all@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 4PRjsL6XGlz3vCbl; Wed, 1 Mar 2023 18:47:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRjsL5y3Qz4CQt; Wed, 1 Mar 2023 18:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677696454; 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=IjXcAFXPyCLMVqfxbOTb940AEE0fUv7/m/0jlJGTJV4=; b=JjJSFISnKYPWi9yUfg0NqJ+ifS/Abj9OaMBS2Rwkh62+oT0s7poXu1VxPPSAwQkCHHRPEw vrMfljwGu2vLiBl6QD5g+ruLUYtUJ8vqEkHaJwMoYfSwY+Ew7LvQbXGjp1UZO7a+fqkGuU wq0Ca+UjBvgiTxg2YFdKFEZucT9AMiNGH1Mq+q7LLUdOtPTzVairBSX5+b6tmAJj3sXSWq 1kUPmj/f5w0NbhGZCE0OzhcdbcVTRibb6nYjOcoZMxh6U2NSwnEBDOxnw1F4j1hDNZ9JQR MXSMVD3C/5PhHXneh7Q0ltU5dXhDjsYNE3+pyYbS+qi83L7w48CdUKYFm5XR/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677696454; 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=IjXcAFXPyCLMVqfxbOTb940AEE0fUv7/m/0jlJGTJV4=; b=GC+a2XVwj+SjLGQfdq5V3ucGA1N9yyXBgBcqCaADhNOvzU+HwMl4koez/BGsPMzdVhCA1b cFJJ89a5wsmh86DXx2+1TapurgKUPj/hNjUUzOxIQCjv9B7CcGXHG4S3RRjSg88RH+bPyN jTmN6WARND1T8BQSGRReGMSK91ABq10UJElPsBSh/XwX5R2L8HdO4NUk/II/pgiR8+rBmK sxXqJV5Ru4nwm1N2WTyKrWuffgH68pnDPFBoRoOeOqybPbyrj7EoBehDgsiQTTkYteJE91 8xgncYZb2+zhtpsjF3cDeyE0hf5C5IgU/2dvMKyYqPG5EtXfie0qCYdYhmbpsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677696454; a=rsa-sha256; cv=none; b=aJ6EbHH3c8B65uU/VOrYdiZoDSDPf2wYVkdPOMnLDSDtCtNTHIDV3CjG+J7B9Ht31d85rI tB61KpV7GYAuimGs4gXZDzHdBPSmCJTm6+yDkZAkfeYofBZbeS+cP+69wKYgNQe5TJj6V6 ZaWVC7zbGDrKM01FwlGwSyC4LO1UIoYnNT42fwur9DeYsRA9/bF4rItgWKMEgLHJKlDgZp SLw8WrpyEqrZ6vIPPk6Dj9AsTPb1nBeYlsc5oTD6X4BfqAlGoUT1RVP+NmOiomz1VpPpVg RU3jwhA7klavTZAvIUBdqvhsZJJGgOU2FV+IUtbven33fXFC6NUaQyDlJzgKGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRjsL4ny9zldy; Wed, 1 Mar 2023 18:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321IlYgr016700; Wed, 1 Mar 2023 18:47:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IlYDj016699; Wed, 1 Mar 2023 18:47:34 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:47:34 GMT Message-Id: <202303011847.321IlYDj016699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6c7bc93da699 - main - g_part_ebr: always create "compat" aliases List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c7bc93da699054bb8ead58fdc226e084d929515 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6c7bc93da699054bb8ead58fdc226e084d929515 commit 6c7bc93da699054bb8ead58fdc226e084d929515 Author: Ed Maste AuthorDate: 2023-02-27 19:13:09 +0000 Commit: Ed Maste CommitDate: 2023-03-01 18:44:01 +0000 g_part_ebr: always create "compat" aliases The "canonical" EBR partition names like `ada0s4+00002081` are not particularly meaningful. The "compat" aliases share the same namespace as the parent MBR, resulting in user-friendly names like `ada0s6`. These names are consistent with the way Linux names EBR partitions. We previously provided a sysctl kern.features.geom_part_ebr_compat (enabled by default) to control the "compat" names. Remove the sysctl and always create the aliases. Relnotes: yes Reviewed by: cem, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38812 --- sys/geom/part/g_part_ebr.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/sys/geom/part/g_part_ebr.c b/sys/geom/part/g_part_ebr.c index f7aaf1c45cb6..1eb8e30d8adf 100644 --- a/sys/geom/part/g_part_ebr.c +++ b/sys/geom/part/g_part_ebr.c @@ -59,11 +59,6 @@ SYSCTL_DECL(_kern_geom_part); static SYSCTL_NODE(_kern_geom_part, OID_AUTO, ebr, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "GEOM_PART_EBR Extended Boot Record"); -static bool compat_aliases = true; -SYSCTL_BOOL(_kern_geom_part_ebr, OID_AUTO, compat_aliases, - CTLFLAG_RDTUN, &compat_aliases, 0, - "Set non-zero to enable EBR compatibility alias names (e.g., ada0p5)"); - #define EBRNAMFMT "+%08u" #define EBRSIZE 512 @@ -284,12 +279,10 @@ g_part_ebr_add(struct g_part_table *basetable, struct g_part_entry *baseentry, ebr_set_chs(basetable, baseentry->gpe_end, &entry->ent.dp_ecyl, &entry->ent.dp_ehd, &entry->ent.dp_esect); - if (compat_aliases) { - idx = 5; - LIST_FOREACH(iter, &basetable->gpt_entry, gpe_entry) - idx++; - entry->ebr_compat_idx = idx; - } + idx = 5; + LIST_FOREACH(iter, &basetable->gpt_entry, gpe_entry) + idx++; + entry->ebr_compat_idx = idx; return (ebr_parse_type(gpp->gpp_type, &entry->ent.dp_typ)); } @@ -301,11 +294,9 @@ g_part_ebr_add_alias(struct g_part_table *table, struct g_provider *pp, g_provider_add_alias(pp, "%s%s" EBRNAMFMT, pfx, g_part_separator, baseentry->gpe_index); - if (compat_aliases) { - entry = (struct g_part_ebr_entry *)baseentry; - g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, - entry->ebr_compat_idx); - } + entry = (struct g_part_ebr_entry *)baseentry; + g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, + entry->ebr_compat_idx); } static struct g_provider * @@ -317,11 +308,9 @@ g_part_ebr_new_provider(struct g_part_table *table, struct g_geom *gp, pp = g_new_providerf(gp, "%s%s" EBRNAMFMT, pfx, g_part_separator, baseentry->gpe_index); - if (compat_aliases) { - entry = (struct g_part_ebr_entry *)baseentry; - g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, - entry->ebr_compat_idx); - } + entry = (struct g_part_ebr_entry *)baseentry; + g_provider_add_alias(pp, "%.*s%u", (int)strlen(pfx) - 1, pfx, + entry->ebr_compat_idx); return (pp); } @@ -573,8 +562,7 @@ g_part_ebr_read(struct g_part_table *basetable, struct g_consumer *cp) entry = (struct g_part_ebr_entry *)baseentry; entry->ent = ent[0]; memcpy(entry->ebr, buf, sizeof(entry->ebr)); - if (compat_aliases) - entry->ebr_compat_idx = idx++; + entry->ebr_compat_idx = idx++; g_free(buf); if (ent[1].dp_typ == 0)