From nobody Tue Jan 24 22:12:52 2023 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 4P1h6s1Vm1z3bgCR; Tue, 24 Jan 2023 22:12:53 +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 4P1h6s0CKbz3DxM; Tue, 24 Jan 2023 22:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598373; 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=qZq0WLo7el4Y02h0f3COGQCEV8alHjlzAVOA3Am8MZA=; b=AGlHzT153vgzgtMfQZPaHpjX/mc7oAlL8dSWy9HLDQgujH9yufZZzFEIe7k+HP/eheAeXL B7gxYjQlKEbHNBtglfh9hiQMId5F1JUWLPDULbW3kJnxSlzuGMRq9eU0dBAsMMtMcFxnNj vocTARhK9+SnnxFuPdwrkm6GqrMq+OJ87JEEB832SRg96u40byQovAxky3PL/2Coq0tF0G yGFor5/zFiwDOxp04sbGlVTlx6Bcb7KOKRz2oss/HGPW8F79AYBJWoh/182DO64YOCvD9Y 5fRC4eQehc8uApuP4P+Ys75b9BclWsbBJsXieeqrQ7kWGcFVV1uXDnoc3qkfaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598373; 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=qZq0WLo7el4Y02h0f3COGQCEV8alHjlzAVOA3Am8MZA=; b=bL+I/CTrxe7Nkwr9pnyC7iJR2AtVpp3a9CDhZDSPqZaGjSnkzA32unAeB0eZHNSxBI0Ep4 A5wVqv/1OiqnALN2YrmbrOEA7/0ojKGnza1V7lESe1QwH1OsSzHFYtxx4rxQpH88lc/V09 Yb9sTbno2mb//jdyB4YSoVuuWo4Ll85Ocu7JYo/D0j1IKbs4AMyj9ZqZjbUuPOH2LclCiP OnMJbGKwEUDWGpvHVooRiAO3MPCzBcXgrRFdvQoOD1ABTLnSgN5GhVoxEi4BciVxoF5K89 mKcht1SOIhqedBB//8sQAP4FYGPMf6m5ua03+dXyvgSmbBikVc0s1Y9Ba0Bvdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598373; a=rsa-sha256; cv=none; b=qhAVUDJE3Ds3WgkX3vdzoW1ZyuihsGWkwRlO4pQuh1Wtd7Gf5DqIlzZIJoyDydaeyhLrLW YJai4vqZo2pH9agXgr0JEKLeaC/WBVm0cArPsc2J54AaHf1cUrCzrQXshRgm/iqEQMeLsX kCTWdBYPkBPqrDhv9NbWPO6eVEqnuHs8DXXD6PejkB4/+VvzRrLtaTnGWM8IlcMTZeu3GL SEHgbMaIor91HtZ+buWvQYWiKJ4uqafOvo5E+Azv+CHOWJLiCmVrE/TMba1lh5Na9qhgLG r60NAmKPQOjnnbwVLFb5I4bc8fxDZMiMXZzBpcxyUvPrLt93no6FMZ0/UDUy/Q== 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 4P1h6r656gzQYT; Tue, 24 Jan 2023 22:12:52 +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 30OMCqZe087643; Tue, 24 Jan 2023 22:12:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMCqcj087642; Tue, 24 Jan 2023 22:12:52 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:52 GMT Message-Id: <202301242212.30OMCqcj087642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: a34fda8a5d1a - stable/13 - geli: Move check for DEVT_DISK into geli_probe_and_attach 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a34fda8a5d1a8dea30a0883689e59c9d64f9e37c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a34fda8a5d1a8dea30a0883689e59c9d64f9e37c commit a34fda8a5d1a8dea30a0883689e59c9d64f9e37c Author: Warner Losh AuthorDate: 2022-10-22 00:16:56 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:36 +0000 geli: Move check for DEVT_DISK into geli_probe_and_attach We only work on DEVT_DISK disks, so move that into the probe to drive the point home better. Sponsored by: Netflix (cherry picked from commit bb3230e40bea68c1a0fc9ba1bee204bc05d7ea78) --- stand/common/devopen.c | 4 +--- stand/libsa/geli/gelidev.c | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stand/common/devopen.c b/stand/common/devopen.c index 8fd2c1796555..4fd955d5a9eb 100644 --- a/stand/common/devopen.c +++ b/stand/common/devopen.c @@ -63,9 +63,7 @@ devopen(struct open_file *f, const char *fname, const char **file) * pw if needed), this will attach the geli code to the open_file by * replacing f->f_dev and f_devdata with pointers to a geli_devdesc. */ - if (f->f_dev->dv_type == DEVT_DISK) { - geli_probe_and_attach(f); - } + geli_probe_and_attach(f); #endif return (0); diff --git a/stand/libsa/geli/gelidev.c b/stand/libsa/geli/gelidev.c index 2dd686c81883..23ded496c23d 100644 --- a/stand/libsa/geli/gelidev.c +++ b/stand/libsa/geli/gelidev.c @@ -301,6 +301,9 @@ geli_probe_and_attach(struct open_file *f) hdesc = (struct disk_devdesc *)(f->f_devdata); + /* We only work on DEVT_DISKs */ + if (hdesc->dd.d_dev->dv_type != DEVT_DISK) + return; /* Get the last block number for the host provider. */ if (hdesc->dd.d_dev->dv_ioctl(f, DIOCGMEDIASIZE, &hmediasize) != 0) return;