From nobody Wed May 11 01:44:25 2022 X-Original-To: dev-commits-src-branches@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 428B61ACBF0E; Wed, 11 May 2022 01:44:26 +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 4Kyd4V12mDz3FjY; Wed, 11 May 2022 01:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652233466; 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=FkCSW+IL32OaRnM2cf3H1hTSgIYTAB8crSMMvS8tFHY=; b=qDHQ9L84HAAwecQRCoLsEMcEz4MMtHPJxhAcfhzhKB25cSYhAic0aSRrMkZmd09XLH5pdi wgtZVZDVBQRw5Lu73ziq27tPSiUNWpaMZ3sOSrEYzK+sYOGu4utked3cxpQflk01Ci3+EX ncyleySD06kbzJjVDJRPXO2ehvvwHSNDgbpuTs2BQugv9V7/3jmBMzgEpA35qeP2tkfUd0 XPbTjHp783S2ni2RmRLfCC5pMWSnly7sXbkSW6kewBGmhE3AHR6DN3tMv9MSnIXVMJqYXu YSowr5p4l8MpcC0LUJB/CexfQ55TvwQfJ/XU2jBkID+qH5S/EzAqL88gd4JN1Q== 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 EAFE011010; Wed, 11 May 2022 01:44:25 +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 24B1iP5X061132; Wed, 11 May 2022 01:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24B1iPpX061131; Wed, 11 May 2022 01:44:25 GMT (envelope-from git) Date: Wed, 11 May 2022 01:44:25 GMT Message-Id: <202205110144.24B1iPpX061131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 217a0796fb0b - stable/13 - GEOM: Fix regression after 7f16b501e25. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 217a0796fb0b8f43efef5a371e98aab36e3a68f7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652233466; 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=FkCSW+IL32OaRnM2cf3H1hTSgIYTAB8crSMMvS8tFHY=; b=rhJcj+bd8sGaK5rW4bMpyjfx/psdP+h58jIq+6H6PSgEkOTPOgogjvrxc6fiR3j0pDSF6Z nETOFNDSf2tXANsOZJIe3kamSrV8swEt8ofVzp9c71nPPR2l07RXHD7pr+Ueyn6A8wRggI rfhhzbS9TeAs86T9Um2D/AVO31ma1aH9NhFStutAX4rHI0rsoxufaYT6Iw3RLjeJrkTeQg NYCLvq3sWK9vU7PFuc7C4ONNOuGVDMF0lIOIj9TVucs4bKN5YDNYpJTTW7MmRuiVLeN0dL BiVB4vpKi/FYWtvGKtnA94uUkhMbs+mpz6Sd9OXq+aX+1McEe9pK3szkArJ+pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652233466; a=rsa-sha256; cv=none; b=ade/Pjl9PQIkDH6xttvVH2oN/5+V92Hef96UHZt1wfvLoGFhDL1IA6NbxnW7VGWZkmbTm0 hU1X/OZwdDzbtw+gUAx3A6hOJVLRojZqC/uOzbrH1tD4dyuWKfZem5bPwvlFJNrplGO+Ks VCUAqV6HYdcn9CXXzgs5qgzPofyveSgpXx1tDw26RIP9uOxrXwWAx2Crk43mA2d/lvTetI hV3R6WBSjwWWBWU8EXki3lC5AVDFUwvFxudUxlysGi0mN1ECBFP2ANG57ZVu5zpSVW5OXY 6UyroLQcBCMHUopyl3RKNxZhF75ZDabBqzwSI4EOefhc2dxqzu0JY+zrypruSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=217a0796fb0b8f43efef5a371e98aab36e3a68f7 commit 217a0796fb0b8f43efef5a371e98aab36e3a68f7 Author: Alexander Motin AuthorDate: 2022-03-16 03:58:09 +0000 Commit: Alexander Motin CommitDate: 2022-05-11 01:20:25 +0000 GEOM: Fix regression after 7f16b501e25. find_geom() in some classes trim leading "/dev/" from geom names. Lack of that in geom_gettree_geom() broke some existing scripts. PR: 262554 MFC after: 2 months (cherry picked from commit bd0f3d34fa20686bac9a418d3a37a3f59c25ab19) --- lib/libgeom/geom_xml2tree.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index a6da0e6d163f..52d21790101e 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -481,6 +482,8 @@ geom_gettree_geom(struct gmesh *gmp, const char *c, const char *g, int parents) char *p; int error; + if (g != NULL && strncmp(g, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) + g += sizeof(_PATH_DEV) - 1; p = geom_getxml_geom(c, g, parents); if (p == NULL) return (errno);