From nobody Mon Jun 20 07:10:32 2022 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 B71A3867FA3; Mon, 20 Jun 2022 07:10:32 +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 4LRLQJ4dY6z4jmw; Mon, 20 Jun 2022 07:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655709032; 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=NHw4mBXIdmOrc0MalZQI9FEOSbckk5AjAP+p/X10KWI=; b=MWa+wS+bBX/1/spPyKFUNjn2/W2P0V6NG3yQjjmBWfaBdRMryF3+sKQWDDdnC395dq6nJk kKraNQbv43c1Bfu7ROjtXWaEslsxyCKHG8LSsE0Qss2FRuSgDno5P7aEFu64yjt5MsumEB JdtJgqnVLIy1n4yRiTKdYE5un2IxrlBS9mDMIApG/kFcSsVb1aRM8nJUELHBDhHLYnQJBG z6BficXHJrBYIEiywax6npe68zGq3bL5zA0mD9FQ9pHuxe7246RFk7OSgV0U7DgnJckxCc LP7WCuVm0EMkkW+tCGHU4VMEvcEaqsedrLh/2oCwtl2FUbBL31LRIP69kUTixw== 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 7F16918AB5; Mon, 20 Jun 2022 07:10:32 +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 25K7AWOo049359; Mon, 20 Jun 2022 07:10:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25K7AWEZ049358; Mon, 20 Jun 2022 07:10:32 GMT (envelope-from git) Date: Mon, 20 Jun 2022 07:10:32 GMT Message-Id: <202206200710.25K7AWEZ049358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: e417249016ef - main - loader: GELI encrypted disk should still use device name disk 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: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e417249016efcca73c9edad21b94b1315bc44601 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655709032; 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=NHw4mBXIdmOrc0MalZQI9FEOSbckk5AjAP+p/X10KWI=; b=sXH/V+BkZUGxf4QA1atEFlQF3c4mMEGApgCFmVYnKxFzqkng64cvAg/PaOypkqNQp7tS4/ UFDiGjdI+NyI8LtdyuBGfEbEtYdX64Z59Q2Yezo09rJQM1o+m1iJ1S9Ji8isMkmBmi8lN6 OujiGa8oxa4TKisO2QZ6TqBi2g1WYO4WSdDp40brn+1fTFo9x3ozYRGEBvomFvz+SeU+Ug ZZJUQKQigY5LCj8bb87WK6I/g/Nt4zGQnAU+vA1cjabplUPJZ7Mf+3d7M1Yd6Xd65gPbQL fcRYHWvoA/Bfij5W5COjmqzYKnN1hIGcAt4tlZgRs0IveKx9/aFrG+F5xJP67g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655709032; a=rsa-sha256; cv=none; b=i4WwMEfLYbTMg+fA5r4UrdEpqXyKvYNfz4akbfCqUQaXx0GUAPCm/NTNvpu7xfNd6vq7/l 0ttGxbPg8aK+CGGJSHOiGRDDk292jYbVYjJLoSUvBO27P0SFSB4aVUo+DDZRM5BMC2vo79 XOM9TU1HIA54Wk0biuidZiBqoFJfDr33ndaV8i24uD1ubyV1DeFSUUBfEiu9offqFMZ7nK RqlcpeQCU0EnPQdbv3pG+HbKY6Z/oXkWv66MysUDAhFm63tFzvMaqvNwowdPO9Hqcw/7Qh 5VsWPtM99Hdd+OyFcxMdHKUzGRx+YP1bQsd8tfGlHoNOWBdgEVCVh8y6jyVR+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=e417249016efcca73c9edad21b94b1315bc44601 commit e417249016efcca73c9edad21b94b1315bc44601 Author: Toomas Soome AuthorDate: 2022-06-20 06:51:44 +0000 Commit: Toomas Soome CommitDate: 2022-06-20 07:10:14 +0000 loader: GELI encrypted disk should still use device name disk geli_probe_and_attach() does pick geli_devsw structure for encrypted disks, the implementation depends on device name "disk" when device type is DEVT_DISK, but geli_devsw is setting name field "gelidisk". PR: 264282 Submitted by: yamagi@yamagi.org Reported by: yamagi@yamagi.org MFC after: 2 weeks --- stand/libsa/geli/gelidev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libsa/geli/gelidev.c b/stand/libsa/geli/gelidev.c index e1444c9b7fcd..d312d7b17e0e 100644 --- a/stand/libsa/geli/gelidev.c +++ b/stand/libsa/geli/gelidev.c @@ -53,7 +53,7 @@ static void geli_dev_cleanup(void); * geli_devdesc, effectively routing all IO operations through our code. */ static struct devsw geli_devsw = { - .dv_name = "gelidisk", + .dv_name = "disk", .dv_type = DEVT_DISK, .dv_init = geli_dev_init, .dv_strategy = geli_dev_strategy,