From nobody Mon Mar 6 13:50:58 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 4PVg2p4VSJz3ww4D; Mon, 6 Mar 2023 13:50:58 +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 4PVg2p3bhfz3NZP; Mon, 6 Mar 2023 13:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110658; 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=ACfH6bx3me7GfAJDxDa7ZSYBQzvxFxVaXL2v3d8+sTA=; b=NFPz9oBlQ+AlwO/R2PhO4bMfSp9N7KnjrTmNkhgDD8yY+wy6jpNpWXjusD35vFjhPnCCek P9ZS9Vk2AqXbSFJcWgHLEyT4Em1vdIuoSj0TYAzEdLq9PzwvceLGvLVXDFhvlbmS0L02qM yN5WMgrwx3Lake0CRuJd69AL8gzSBvbyBHfeIiEzxre4QA8zj9U/iXp3YtUfNw3BAnTfs9 4tScOGRQjLe8i8AQvhKeIhIIfxcu0aA2GyD536FB27mTJgaJytGgnDO81iEjj0nYWHfwuW gUmkX7Aq/Q08EpJHAkqLGMSfGE73WP4G4x/Euv49EkBe5ENEonnotExawVKEtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110658; 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=ACfH6bx3me7GfAJDxDa7ZSYBQzvxFxVaXL2v3d8+sTA=; b=P/vUsQoGtB4u7sC+bOSdwNpwWW4nWN4eFmbG54koGewwNLn/bIGnt9qOg9U2TwTs+eSOHE hsLoACQcohV9aSCUIwEzxQw5fv8sdk03fn24gyBocPTUWvz/+LQlEQkUnA4/XCJZ4DR/db PP6xx9QfvZzQoRpDHQ8TcKBMa3d68ocWFEU1xoGDhDPrgffNHmyMUJQTY8FfCyC+RObSiv iMwAYUtytXtUf3m9MUn/OwsWy8w+gQgO5AsK+AgG5as0ViPwv1gKuykZNJKnwaxl2P6dBn TXLJajQwWJ55q7W7/I+BgOdyxJ1PFOheGCJ9gKNpjGKV5pa2Jerw4wGFcNCXPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678110658; a=rsa-sha256; cv=none; b=Bo22vM/AhxYIElBN1/Zwjzd4lsc0montZ8E0pNFgrw8PUfr4sjxEm1FkPRbckeCi4GEqMp gHgRL/KGiS22VlGCAFmiyH7RjSEZz/KxSwTP0IZK01GExvLQD2pIaLFZ88fuXosREw9iAi Z/W+SwSpem1lO3AVCuUtsgJEac9BeW6YqV18i+IYW6hftpHyR/cVF0zw02H4oIiAfL20C2 VQU8D9Irve0xBjqS40b4hqeK3JAdg8WMnkjML5g0TNl2ZUe0VVC7RAb/1peHoqRvcEztj+ o2geiLrRMTFOX3ZJs0stCEakD27wNjBees4t8rF4qfVPutsH031RRCKDSYN+jA== 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 4PVg2p2hdBz14TK; Mon, 6 Mar 2023 13:50:58 +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 326DowfO056214; Mon, 6 Mar 2023 13:50:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326Dowh2056213; Mon, 6 Mar 2023 13:50:58 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:50:58 GMT Message-Id: <202303061350.326Dowh2056213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1ee4ec78c22d - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1ee4ec78c22d8f50583a0e17cace9ddcb1d99fc0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1ee4ec78c22d8f50583a0e17cace9ddcb1d99fc0 commit 1ee4ec78c22d8f50583a0e17cace9ddcb1d99fc0 Author: Ed Maste AuthorDate: 2023-02-27 19:13:09 +0000 Commit: Ed Maste CommitDate: 2023-03-06 13:50:33 +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 (cherry picked from commit 6c7bc93da699054bb8ead58fdc226e084d929515) --- 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)