From nobody Mon Jul 4 06:15:38 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 D7FA68BD08C; Mon, 4 Jul 2022 06:15:38 +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 4LbwXV5nwHz3qhJ; Mon, 4 Jul 2022 06:15:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656915338; 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=7FZUN8EPTfPZh+y78Bd64EEgyI2xxRmrOVSLY/nzG4Y=; b=T5RW7gHz2/OwHgBOFyr+BeR1i79HOBPpLjFrGFh7zIvSOXQnz30w9yy/UKP9Tp5fAdKhFV 3RdKLfWdrv8mV+kcKojTUaAwfzkl71RxCL5bwyYNFCuoIUmv/gCq/a21fO2SjvPWcmllob Pl1gxYCRcywMhz5IWItnC0l69tlQfy7oZWcJaGORmDBrOPRM4z6kQo4rsf9r03aHDXnB6S Hrsv6coY5v6IEwEmAUQ6pOBDHiWM2jFccFC5uf5kw2hsyyp3R8VXrJJaUMt/93pr42kJr6 EtDb5XVHQ9VxEAxsOv2SgZQcyczb2Nomf+SxNp8XXWF6aotcZ1GA+VIUJJ0PhA== 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 A6CC23B71; Mon, 4 Jul 2022 06:15:38 +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 2646Fc00000272; Mon, 4 Jul 2022 06:15:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2646FcPa000271; Mon, 4 Jul 2022 06:15:38 GMT (envelope-from git) Date: Mon, 4 Jul 2022 06:15:38 GMT Message-Id: <202207040615.2646FcPa000271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Toomas Soome Subject: git: 67f8b6d985db - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 67f8b6d985dbc85682d6f8b2dd5117068c19ca59 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656915338; 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=7FZUN8EPTfPZh+y78Bd64EEgyI2xxRmrOVSLY/nzG4Y=; b=HDcsOwtMrqti6V+UerpcceHGvEZqdLMPsdJVybh2l0XYOVyfL6zNL18Q5siaXHaypBC8ev g7Y2icub2kkFaNWT6Pja5cKpfpc9yjUqTaNNgPMF8GbFy9cFz8qKYLOhU0uiAEVaQxa4nf ArtBDW53SjrenAxk05yxPFVF8Du4eBghUpWj4YgVgVqU0ZWRPK9znNZMyPXNP0KMV+KjxE 7lej5nDR0io26d2uDVd1U1qeI98QAPNCwCr9GSp6Df7BxWpsyQU+MtJtayWTWqNnzw4zCs 5Zchgru4bNJSFnMvRWfovBRI8qLNuZyneoy4SXhvHS3f5PpycOFg2WjXG5Jr3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656915338; a=rsa-sha256; cv=none; b=dCOB3ko4p07a9OCkLUrxXLdHGk/zWWNSXU3vqT3ATYSTlT/YOPU9t/XaOJax9d8ppr60Xq PZKMMCrie/R9saJIo506VW8ooLITPCN00SWnuWLHJw9mfn5GEd7Rx49UfsBtjIPAaReMd6 52l7G+bkJFsD9vFA66TA2Fw5yJK33FmlFU9RHzgNr3h3xUI5Hii54PJxFtExaQNRHnjoEy opRwyKhOV11HYnmISpsfwVCx4KY9VfNm7ZhkpaOsOPH2MLejj6FB2CyS/YgUhoDkXFhdBQ oeckmJ/d+EzLOmQEq5tkLRrcSolxc5oN6pyiTVzsdrRKl5rgr8kRDD1z3Be+2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=67f8b6d985dbc85682d6f8b2dd5117068c19ca59 commit 67f8b6d985dbc85682d6f8b2dd5117068c19ca59 Author: Toomas Soome AuthorDate: 2022-06-20 06:51:44 +0000 Commit: Toomas Soome CommitDate: 2022-07-04 06:14:43 +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 (cherry picked from commit e417249016efcca73c9edad21b94b1315bc44601) --- 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,