From nobody Tue Jan 24 22:11:52 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 4P1h5j3JVSz3bfcx; Tue, 24 Jan 2023 22:11: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 4P1h5j1Ghpz4Pp3; Tue, 24 Jan 2023 22:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598313; 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=OT22BM1dBLZ6+MnRXAA1+HxG4XkIUb3GV0Z/6idq4aM=; b=pRib3ZQ9q7g8uL2hiqV78WYAvz3cJohdtnp2wtRBVcna4+8bZpe3HrBS7xX6GNq24yzeaW G5FmUw9tLrTZiuFJy7aJN7eT0ZZ/F6JtUu3CAxy1IEhH31z61ZkietZK6hPex0tMfSn00W u1zhBy72IXV1UDC8QKfwHHVFEGrd5JZ69iJMngs/APjFIdW4goauhkpt9qRqBhvrfVCUjO qVCdceGpbb4QYBq53t/5ezT4SjvWThoFlkNeiSkOAkcqLw5T0e01ZSCN9JjvCPhFu+rVoz 0Y8totuprplh9JbrPZHNKD5Ire27VyuKST3IH8tRGDgLsY6IwPquzTeeoLlhYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598313; 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=OT22BM1dBLZ6+MnRXAA1+HxG4XkIUb3GV0Z/6idq4aM=; b=sRZmdSMnp7j80xTwDlK+WPLHxDBZzXpsaXWFn/2FgBK+cU4QwtPWXfT9sXSo+ko/0aPZjx mlp0TjEANYzzia2MDfF7QtzU/rGpjYToyoaAKsem1rRcMpTosoIyWSSDMhHquNjt4DE1VJ Al6C00aHqjmIzPz9qbhdRApFaqzES54J7y/+q2pq8BZVO1pUo7efUxlm7zkb8eKXqny8ck yPOWYsDQUaYbajyTzJDg3XLcJiK5ALA+/lAJx7MZ7EVC0eWy+5D2wR6PXJdEU1dyfhvvnL yYUBpUn4C3/B2ZMrm5Y/epcn391pO+ax/Z+zD5FYe6pGrbYKSGvMbTjGJDB2ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598313; a=rsa-sha256; cv=none; b=M7xqvGfwQpIris5adP/VowJ/4VoD6lv9k3pDCHYs5xvei5MYuJ9ryylFv0lK0HOcaoeLPw m83xmX79VHGEORebNJvA3K+t4oipzDlMlOmOAGhE22oKjMkPRnkKb5xeqtqgjy2VVhwYxe bQEocDvhe5VgFVdVCl9U5/0TA91HqRbXCVo+pfUrjpOQpMPToByUdAG8zlfkuHPv//qSoS as8MN0epyOIkfcwYaabdaGWO+W9EFerhBMTY2pXlSCsNKdArVkSrQMIrSYFEnbcB1xSRdB lr7cMjel54TyURboPzPvGFlxvSDiOyPO/KuxHxCzRGzHTigxjErETrxNXCGOnQ== 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 4P1h5j0L82zQGh; Tue, 24 Jan 2023 22:11:53 +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 30OMBq1F085327; Tue, 24 Jan 2023 22:11:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMBqZL085326; Tue, 24 Jan 2023 22:11:52 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:52 GMT Message-Id: <202301242211.30OMBqZL085326@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: 9dee581ad980 - stable/13 - stand: Change disk_fmtdev to take a struct devdesc * 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9dee581ad98055d8e56186f990f9bef18c0376bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9dee581ad98055d8e56186f990f9bef18c0376bf commit 9dee581ad98055d8e56186f990f9bef18c0376bf Author: Warner Losh AuthorDate: 2022-08-11 15:04:50 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:30 +0000 stand: Change disk_fmtdev to take a struct devdesc * We do a number of games with ploymorphism for different types struct *devdesc. Adjust one place that this affects to take the address of the base class (most others have void * at the moment). This is more type safe than a bare void *. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D35914 (cherry picked from commit c32dde3166922f55927764464d13f1bc9640f5f6) --- stand/common/disk.c | 5 ++++- stand/common/disk.h | 3 ++- stand/libsa/geli/gelidev.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stand/common/disk.c b/stand/common/disk.c index 3ad147da0e5b..15daf7e358c6 100644 --- a/stand/common/disk.c +++ b/stand/common/disk.c @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "disk.h" @@ -386,11 +387,13 @@ disk_close(struct disk_devdesc *dev) } char * -disk_fmtdev(struct disk_devdesc *dev) +disk_fmtdev(struct devdesc *vdev) { + struct disk_devdesc *dev = (struct disk_devdesc *)vdev; static char buf[128]; char *cp; + assert(vdev->d_dev->dv_type == DEVT_DISK); cp = buf + sprintf(buf, "%s%d", dev->dd.d_dev->dv_name, dev->dd.d_unit); if (dev->d_slice > D_SLICENONE) { #ifdef LOADER_GPT_SUPPORT diff --git a/stand/common/disk.h b/stand/common/disk.h index 83109981e0a8..806673349cb8 100644 --- a/stand/common/disk.h +++ b/stand/common/disk.h @@ -116,7 +116,8 @@ extern int ptblread(void *, void *, size_t, uint64_t); * Print information about slices on a disk. */ extern int disk_print(struct disk_devdesc *, char *, int); -extern char* disk_fmtdev(struct disk_devdesc *); extern int disk_parsedev(struct disk_devdesc *, const char *, const char **); +char *disk_fmtdev(struct devdesc *vdev); + #endif /* _DISK_H */ diff --git a/stand/libsa/geli/gelidev.c b/stand/libsa/geli/gelidev.c index d312d7b17e0e..5dd122a4a681 100644 --- a/stand/libsa/geli/gelidev.c +++ b/stand/libsa/geli/gelidev.c @@ -305,7 +305,7 @@ geli_probe_and_attach(struct open_file *f) hlastblk = (hmediasize / DEV_BSIZE) - 1; /* Taste the host provider. If it's not geli-encrypted just return. */ - gdev = geli_taste(diskdev_read, hdesc, hlastblk, disk_fmtdev(hdesc)); + gdev = geli_taste(diskdev_read, hdesc, hlastblk, disk_fmtdev(&hdesc->dd)); if (gdev == NULL) return;