From owner-dev-commits-src-main@freebsd.org Mon Feb 22 17:57:13 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 660ED54788B; Mon, 22 Feb 2021 17:57:13 +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 4DkqdP2VqVz4VSj; Mon, 22 Feb 2021 17:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 48AA51A4D; Mon, 22 Feb 2021 17:57:13 +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 11MHvDWS034136; Mon, 22 Feb 2021 17:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11MHvDdL034135; Mon, 22 Feb 2021 17:57:13 GMT (envelope-from git) Date: Mon, 22 Feb 2021 17:57:13 GMT Message-Id: <202102221757.11MHvDdL034135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: ba2cfa80e1f2 - main - Fix makefs bootstrap after d485c77f203fb0f4cdc08dea5ff81631b51d8809 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba2cfa80e1f2a7e8ffd383e615aa304afa349ed7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2021 17:57:13 -0000 The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=ba2cfa80e1f2a7e8ffd383e615aa304afa349ed7 commit ba2cfa80e1f2a7e8ffd383e615aa304afa349ed7 Author: Alex Richardson AuthorDate: 2021-02-22 17:49:05 +0000 Commit: Alex Richardson CommitDate: 2021-02-22 17:55:45 +0000 Fix makefs bootstrap after d485c77f203fb0f4cdc08dea5ff81631b51d8809 The makefs msdosfs code includes fs/msdosfs/denode.h which directly uses struct buf from rather than the makefs struct m_buf. To work around this problem provide a local denode.h that includes ffs/buf.h and defines buf as an alias for m_buf. Reviewed By: kib, emaste Differential Revision: https://reviews.freebsd.org/D28835 --- lib/libprocstat/msdosfs.c | 1 + sys/fs/msdosfs/denode.h | 2 -- usr.sbin/makefs/msdos.c | 2 +- usr.sbin/makefs/msdos.h | 1 - usr.sbin/makefs/msdos/denode.h | 39 ++++++++++++++++++++++++++++++++++ usr.sbin/makefs/msdos/msdosfs_denode.c | 5 +---- usr.sbin/makefs/msdos/msdosfs_fat.c | 5 +---- usr.sbin/makefs/msdos/msdosfs_lookup.c | 5 +---- usr.sbin/makefs/msdos/msdosfs_vfsops.c | 5 +---- usr.sbin/makefs/msdos/msdosfs_vnops.c | 5 +---- usr.sbin/makefs/sys/buf.h | 30 ++++++++++++++++++++++++++ 11 files changed, 76 insertions(+), 24 deletions(-) diff --git a/lib/libprocstat/msdosfs.c b/lib/libprocstat/msdosfs.c index 87906423f9b6..3541f252c713 100644 --- a/lib/libprocstat/msdosfs.c +++ b/lib/libprocstat/msdosfs.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h index f06c11772621..7c838b5cc81c 100644 --- a/sys/fs/msdosfs/denode.h +++ b/sys/fs/msdosfs/denode.h @@ -52,8 +52,6 @@ #ifndef _FS_MSDOSFS_DENODE_H_ #define _FS_MSDOSFS_DENODE_H_ -#include - /* * This is the pc filesystem specific portion of the vnode structure. * diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c index 567122c1db7e..74d55a7f490f 100644 --- a/usr.sbin/makefs/msdos.c +++ b/usr.sbin/makefs/msdos.c @@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include #include "msdos/direntry.h" -#include +#include "msdos/denode.h" #include #undef clrbuf diff --git a/usr.sbin/makefs/msdos.h b/usr.sbin/makefs/msdos.h index a51420de76e5..ea78e49648a3 100644 --- a/usr.sbin/makefs/msdos.h +++ b/usr.sbin/makefs/msdos.h @@ -41,7 +41,6 @@ } while (0); -struct vnode; struct denode; struct fsnode; struct msdosfsmount; diff --git a/usr.sbin/makefs/msdos/denode.h b/usr.sbin/makefs/msdos/denode.h new file mode 100644 index 000000000000..4590a76c3501 --- /dev/null +++ b/usr.sbin/makefs/msdos/denode.h @@ -0,0 +1,39 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2018-2020 Alex Richardson + * + * This work was supported by Innovate UK project 105694, "Digital Security by + * Design (DSbD) Technology Platform Prototype". + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#pragma once +/* Ensure that struct denode uses the local m_buf structure and not sys/buf.h */ +#define buf m_buf +struct vn_clusterw { + /* Not interesting for msdosfs makefs. */ +}; +#include "../ffs/buf.h" +/* struct direntry needs to be defined to included denode.h */ +#include "msdos/direntry.h" +#include diff --git a/usr.sbin/makefs/msdos/msdosfs_denode.c b/usr.sbin/makefs/msdos/msdosfs_denode.c index f2faed234228..48c305824793 100644 --- a/usr.sbin/makefs/msdos/msdosfs_denode.c +++ b/usr.sbin/makefs/msdos/msdosfs_denode.c @@ -62,13 +62,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include "msdos/denode.h" #include #include -#undef clrbuf -#include "ffs/buf.h" #include "makefs.h" #include "msdos.h" diff --git a/usr.sbin/makefs/msdos/msdosfs_fat.c b/usr.sbin/makefs/msdos/msdosfs_fat.c index a70b5741aa78..b5700d8c7d1d 100644 --- a/usr.sbin/makefs/msdos/msdosfs_fat.c +++ b/usr.sbin/makefs/msdos/msdosfs_fat.c @@ -60,13 +60,10 @@ #include #include -#include "msdos/direntry.h" -#include +#include "msdos/denode.h" #include #include -#undef clrbuf -#include "ffs/buf.h" #include "makefs.h" #include "msdos.h" diff --git a/usr.sbin/makefs/msdos/msdosfs_lookup.c b/usr.sbin/makefs/msdos/msdosfs_lookup.c index 3fca0532468b..a4db6ae1a4a2 100644 --- a/usr.sbin/makefs/msdos/msdosfs_lookup.c +++ b/usr.sbin/makefs/msdos/msdosfs_lookup.c @@ -58,13 +58,10 @@ #include #include -#include "msdos/direntry.h" -#include +#include "msdos/denode.h" #include #include -#undef clrbuf -#include "ffs/buf.h" #include "makefs.h" #include "msdos.h" diff --git a/usr.sbin/makefs/msdos/msdosfs_vfsops.c b/usr.sbin/makefs/msdos/msdosfs_vfsops.c index b6788f6876f9..dd933bb2be61 100644 --- a/usr.sbin/makefs/msdos/msdosfs_vfsops.c +++ b/usr.sbin/makefs/msdos/msdosfs_vfsops.c @@ -63,15 +63,12 @@ __FBSDID("$FreeBSD$"); #include #include -#include "msdos/direntry.h" -#include +#include "msdos/denode.h" #include #include #include -#undef clrbuf -#include "ffs/buf.h" #include "makefs.h" #include "msdos.h" diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c index 2233c4b35eb2..7e927b4b99c7 100644 --- a/usr.sbin/makefs/msdos/msdosfs_vnops.c +++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c @@ -65,13 +65,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include "msdos/direntry.h" -#include +#include "msdos/denode.h" #include #include -#undef clrbuf -#include "ffs/buf.h" #include "makefs.h" #include "msdos.h" diff --git a/usr.sbin/makefs/sys/buf.h b/usr.sbin/makefs/sys/buf.h new file mode 100644 index 000000000000..4b640a98dd2c --- /dev/null +++ b/usr.sbin/makefs/sys/buf.h @@ -0,0 +1,30 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2018-2020 Alex Richardson + * + * This work was supported by Innovate UK project 105694, "Digital Security by + * Design (DSbD) Technology Platform Prototype". + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#error " should not be included by makefs"