From nobody Thu Aug 11 16:27:44 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 4M3XKD4Y2Qz4Ys3X; Thu, 11 Aug 2022 16:27:44 +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 4M3XKD3gPzz3qHf; Thu, 11 Aug 2022 16:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660235264; 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=OUBX7JU+yW3aFqnJ0O+X2OwqpGTpb01iEsW2IztGolo=; b=ELdVpCYh4hxbGZLmoqwdqZs5RNkJf7nNjgHSPBKny3oI8qXV1DQOSmaN3nhqsJAhjIlWDn zYUSfZuBPqnQBhWpdTPS4/lYmUksqCDAEOgD0NCFKJCpYrlOnEK1vfaBKYWNjzC53UAAIy FSlPbvRLDl81faGxw9ojjiKlv8ZVUU3Phf8tx8tVeouCT9BEkzSOXL66TxkdBfPLYvGZv3 fAJM5KIrSixQfu4uBL3XIO6WuLrVM/3L9UBB5KvrnLLlKsNiJ90z9WnDub5Q2VbYRUib2G 3baMPvoCxH99tTY2MbeqL4DvDQw3arPiLDMZwjQUdLn/66E7rg9WkLoiJNVBmQ== 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 4M3XKD2KTtzyKf; Thu, 11 Aug 2022 16:27:44 +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 27BGRik4055430; Thu, 11 Aug 2022 16:27:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BGRiUq055429; Thu, 11 Aug 2022 16:27:44 GMT (envelope-from git) Date: Thu, 11 Aug 2022 16:27:44 GMT Message-Id: <202208111627.27BGRiUq055429@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: 0b3a4a588fb6 - main - stand: Use devformat instead of disk_devfmt 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: 0b3a4a588fb6b30d923686828dab4685b94ec1ea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660235264; 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=OUBX7JU+yW3aFqnJ0O+X2OwqpGTpb01iEsW2IztGolo=; b=H2G68C7iIUu6b9YS62M9M0vwZjJqH/T0TZ6HumqB0WtfS2UsgOC1pfbOfpRGEvY31mD7Wv isNkpHL/FbrELKwFZ6JfAO3bgSQgdwTDmH/1mmuGfdGRiJNYhEtROyGsp4NXPYNu7QwrDI cqF96JFJsdUhm6bjkyoYo2cZPzj+GktAlxI8gFGsTmNcW44Jyi/Qw2YHB4oqSzI3t6ii3W Il0Jn9bka3RAvIZCmcxOAZqhFhKkF+lePpI8gF2gdqXss6vHdQyXUW1np2mJU8wiMntk3o zB1u+c5GmXpaNRTXUniVNg2vGjryy7ZRhtTzQkiwPrd2eSzu4CTx4iQtFEficQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660235264; a=rsa-sha256; cv=none; b=PL5/vYoORXW7hh0utu2DIiNGU4Ks/6wiM6ydw61XY7y7EFAJII5NMJJidAw3C7wDOz3XvO 4Lx+JA1ofmoNyJgd60B/haHOjZfopQDvE4VvjpR6lSVgI44QIvNRtJSCLSp/QVjofGT6at KQjd2JYN2VOa/gwVpyJiawmujt37PpKkgl3cJ0QDGXrJqOWCezJoTY+p4vip86Wuse7QZg 2gHkMZh5Nl1COAnjhSswpnBr+a/ZDjQWvfQDDkghR42Bve6xwVCVDzKWEc+AHY39B+cmb2 ourboXIGHmvVkZUV1nALFMf3z1aMY8CwcodDuhVyRReCcpDnbuLHEwXtkDzmqA== 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=0b3a4a588fb6b30d923686828dab4685b94ec1ea commit 0b3a4a588fb6b30d923686828dab4685b94ec1ea Author: Warner Losh AuthorDate: 2022-08-11 15:07:13 +0000 Commit: Warner Losh CommitDate: 2022-08-11 16:27:16 +0000 stand: Use devformat instead of disk_devfmt Use devformat instead of disk_devfmt. This allows us to avoid knowing the details of the device that's underneath us. Remove disk.h include and the -I${LDRSRC} from the build of ufs.c since they are no longer needed. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D35922 --- stand/libsa/Makefile | 1 - stand/libsa/ufs.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index c2372e192b38..dc35fe007506 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -170,7 +170,6 @@ SRCS+= time.c .PATH: ${SRCTOP}/sys/ufs/ffs SRCS+=ffs_subr.c ffs_tables.c -CFLAGS.ufs.c+= -I${LDRSRC} CFLAGS.gzipfs.c+= ${ZLIB_CFLAGS} CFLAGS.pkgfs.c+= ${ZLIB_CFLAGS} CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index de3dbe58789b..ef7cb07e75da 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -81,7 +81,6 @@ __FBSDID("$FreeBSD$"); #include #include #include "stand.h" -#include "disk.h" #include "string.h" static int ufs_open(const char *path, struct open_file *f); @@ -520,7 +519,7 @@ ufs_open(const char *upath, struct open_file *f) return (errno); f->f_fsdata = (void *)fp; - dev = disk_fmtdev(f->f_devdata); + dev = devformat((struct devdesc *)f->f_devdata); /* Is this device mounted? */ STAILQ_FOREACH(mnt, &mnt_list, um_link) { if (strcmp(dev, mnt->um_dev) == 0) @@ -739,7 +738,7 @@ ufs_close(struct open_file *f) } free(fp->f_buf); - dev = disk_fmtdev(f->f_devdata); + dev = devformat((struct devdesc *)f->f_devdata); STAILQ_FOREACH(mnt, &mnt_list, um_link) { if (strcmp(dev, mnt->um_dev) == 0) break;