From nobody Thu Aug 11 16:27:41 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 4M3XKB3d68z4Ys1C; Thu, 11 Aug 2022 16:27:42 +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 4M3XKB1Lw9z3q6g; Thu, 11 Aug 2022 16:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660235262; 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=MMTWcjBV1WCpOALlB8zZSbMBIt/afNMNur/pJxKBLWI=; b=TsZzwgob47z9P4bAcexMpEL/qJnDthdxd4tYEYjgTmO3yo1Ww8QopjE7qiFHI337W4EumO QS2UZuNAPlLm2041/yvTmAPab0HV48tMrCz7TQ4SVJ5N6lJZ3BsKPxetAaDYUc+Y0LUYQx o53VxuqZDfz8KfYIm4DRhgl2H76/dG6sPe7LavHn5EVdsF8Ediz8xrDlgrySDdZSWQpusz RnXxGzehEthjrJ/pCRXUdmeoL2R2578/mHSVYtnLTN+h4oUg/ZO8hasqMCAy3HE2VmJz0a cHBbPmT6drparh+ZN3kr7Y/s3pxyIEKF+OfZLbZREXfOmRGCuPkWuoTAd/44ww== 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 4M3XKB0K6Wzy4h; Thu, 11 Aug 2022 16:27:42 +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 27BGRfh4055378; Thu, 11 Aug 2022 16:27:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BGRfUh055377; Thu, 11 Aug 2022 16:27:41 GMT (envelope-from git) Date: Thu, 11 Aug 2022 16:27:41 GMT Message-Id: <202208111627.27BGRfUh055377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ad759c73522e - main - stand: Add disk_fmtdev for dv_fmtdev for all the disk devices 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/main X-Git-Reftype: branch X-Git-Commit: ad759c73522efb606135e2891ac03864926b80a3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660235262; 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=MMTWcjBV1WCpOALlB8zZSbMBIt/afNMNur/pJxKBLWI=; b=X9l29lfimDQymG0l/IeF4xrpN6YN+iMc7wJP/Te0PMtE1RqtRQQCAtIMqtMoUuNyGimsCW i8QyA/Qv4FJPvz1wyk124crfSYE/gnUYNMND0p0UtanR2OjivsOCS70QXbZRT6Y63erd8g B898zh0xljoyBbW8OrOtZkGvwn52O8w+Adl9If9a/t8E3Wms8w2b0ciUSAMIjsLS5wS2w0 HIEnWJEtgbF5hySPvAhLddwY4kjssuGBVdqGX+WVlLng0X71QafkoHtv8DMYOZr9wy9US1 1tZyRJLZZnMafbumaH8itLmdzV2u8iovZtEtD9S/JepyMsGiHjf11K29xf2Mbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660235262; a=rsa-sha256; cv=none; b=JLJ7lnVIQjuORnhm5wrGvL098rrrOiwwccm/5Tg9+VMU9fm/U6c+0z0H9Va8a3zDhPWHuq o3AcghhlZ2c75tZWWj+xwKAAf4kMh2oa3Cesk6Dw8dI4WjYUkhj0MWABmY+fxkZBEPS1BG piVO2AJouoUswAfUHHQ0Z4VJNv7ychW838og+MOa7H2Xamqtt9pyFsmmOPpYyVPGM2RtkG BnMyTQSETOADLOGaruvZ8SfTQGQaWMc/qubpCVcGk55yt45kLZaBqo3v4onrCsRqrxoyLk q/6gdwxAUCbjXSIcRnDQpqjt5qdQwED/YeWv4APiN3MtNGV6EVLcBHqyJw+SMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ad759c73522efb606135e2891ac03864926b80a3 commit ad759c73522efb606135e2891ac03864926b80a3 Author: Warner Losh AuthorDate: 2022-08-11 15:06:28 +0000 Commit: Warner Losh CommitDate: 2022-08-11 16:27:16 +0000 stand: Add disk_fmtdev for dv_fmtdev for all the disk devices All of the archsw fmtdev functions treat DEVT_DISK as a call to disk_fmtdev. Set all disks' dv_fmtdev to disk_fmtdev so devformat will return the same thing. Sponsored by: Netflix Reviewed by: tsoome (prior version) Differential Revision: https://reviews.freebsd.org/D35917 --- stand/common/md.c | 1 + stand/common/vdisk.c | 1 + stand/efi/libefi/efipart.c | 1 + stand/i386/libi386/biosdisk.c | 1 + stand/kboot/hostdisk.c | 2 ++ stand/libofw/ofw_disk.c | 3 ++- stand/libsa/geli/gelidev.c | 3 ++- stand/uboot/uboot_disk.c | 1 + stand/usb/storage/umass_loader.c | 1 + stand/userboot/userboot/userboot_disk.c | 1 + 10 files changed, 13 insertions(+), 2 deletions(-) diff --git a/stand/common/md.c b/stand/common/md.c index 61db56ece7ae..9f95d3cdfd2d 100644 --- a/stand/common/md.c +++ b/stand/common/md.c @@ -75,6 +75,7 @@ struct devsw md_dev = { .dv_ioctl = noioctl, .dv_print = md_print, .dv_cleanup = nullsys, + .dv_fmtdev = disk_fmtdev, }; static int diff --git a/stand/common/vdisk.c b/stand/common/vdisk.c index c904613a8e91..c4220787b1ac 100644 --- a/stand/common/vdisk.c +++ b/stand/common/vdisk.c @@ -53,6 +53,7 @@ struct devsw vdisk_dev = { .dv_ioctl = vdisk_ioctl, .dv_print = vdisk_print, .dv_cleanup = nullsys, + .dv_fmtdev = disk_fmtdev, }; typedef STAILQ_HEAD(vdisk_info_list, vdisk_info) vdisk_info_list_t; diff --git a/stand/efi/libefi/efipart.c b/stand/efi/libefi/efipart.c index e5c9c88234b7..88587192a1b7 100644 --- a/stand/efi/libefi/efipart.c +++ b/stand/efi/libefi/efipart.c @@ -103,6 +103,7 @@ struct devsw efipart_hddev = { .dv_ioctl = efipart_ioctl, .dv_print = efipart_printhd, .dv_cleanup = nullsys, + .dv_fmtdev = disk_fmtdev, }; static pdinfo_list_t fdinfo = STAILQ_HEAD_INITIALIZER(fdinfo); diff --git a/stand/i386/libi386/biosdisk.c b/stand/i386/libi386/biosdisk.c index 4f07343344fd..3539d206d011 100644 --- a/stand/i386/libi386/biosdisk.c +++ b/stand/i386/libi386/biosdisk.c @@ -190,6 +190,7 @@ struct devsw bioshd = { .dv_ioctl = bd_ioctl, .dv_print = bd_print, .dv_cleanup = nullsys, + .dv_fmtdev = disk_fmtdev, }; static bdinfo_list_t * diff --git a/stand/kboot/hostdisk.c b/stand/kboot/hostdisk.c index cd125350ce9b..00f133274f10 100644 --- a/stand/kboot/hostdisk.c +++ b/stand/kboot/hostdisk.c @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include #include "bootstrap.h" #include "host_syscall.h" +#include "disk.h" static int hostdisk_init(void); static int hostdisk_strategy(void *devdata, int flag, daddr_t dblk, @@ -49,6 +50,7 @@ struct devsw hostdisk = { .dv_ioctl = hostdisk_ioctl, .dv_print = hostdisk_print, .dv_cleanup = nullsys, + .dv_fmtdev = disk_fmtdev, }; static int diff --git a/stand/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c index 086b16a9ecdc..5585b463c737 100644 --- a/stand/libofw/ofw_disk.c +++ b/stand/libofw/ofw_disk.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "bootstrap.h" +#include "disk.h" #include "libofw.h" static int ofwd_init(void); @@ -60,6 +60,7 @@ struct devsw ofwdisk = { .dv_ioctl = ofwd_ioctl, .dv_print = ofwd_print, .dv_cleanup = nullsys, + .dv_fmtdev = disk_fmtdev, }; /* diff --git a/stand/libsa/geli/gelidev.c b/stand/libsa/geli/gelidev.c index 5dd122a4a681..5f1143399fb3 100644 --- a/stand/libsa/geli/gelidev.c +++ b/stand/libsa/geli/gelidev.c @@ -62,6 +62,7 @@ static struct devsw geli_devsw = { .dv_ioctl = geli_dev_ioctl, .dv_print = geli_dev_print, .dv_cleanup = geli_dev_cleanup, + .dv_fmtdev = disk_fmtdev, }; /* @@ -305,7 +306,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->dd)); + gdev = geli_taste(diskdev_read, hdesc, hlastblk, devformat(&hdesc->dd)); if (gdev == NULL) return; diff --git a/stand/uboot/uboot_disk.c b/stand/uboot/uboot_disk.c index 236a118b915a..2a41d1181992 100644 --- a/stand/uboot/uboot_disk.c +++ b/stand/uboot/uboot_disk.c @@ -90,6 +90,7 @@ struct devsw uboot_storage = { .dv_ioctl = stor_ioctl, .dv_print = stor_print, .dv_cleanup = stor_cleanup, + .dv_fmtdev = disk_fmtdev, }; static int diff --git a/stand/usb/storage/umass_loader.c b/stand/usb/storage/umass_loader.c index 1c12f05c2769..cc1f6b68e275 100644 --- a/stand/usb/storage/umass_loader.c +++ b/stand/usb/storage/umass_loader.c @@ -61,6 +61,7 @@ struct devsw umass_disk = { .dv_ioctl = umass_disk_ioctl, .dv_print = umass_disk_print, .dv_cleanup = umass_disk_cleanup, + .dv_fmtdev = disk_fmtdev, }; static int diff --git a/stand/userboot/userboot/userboot_disk.c b/stand/userboot/userboot/userboot_disk.c index ed8a6dbdbbfb..d5b0f36e5e50 100644 --- a/stand/userboot/userboot/userboot_disk.c +++ b/stand/userboot/userboot/userboot_disk.c @@ -72,6 +72,7 @@ struct devsw userboot_disk = { .dv_ioctl = userdisk_ioctl, .dv_print = userdisk_print, .dv_cleanup = userdisk_cleanup, + .dv_fmtdev = disk_fmtdev, }; /*