mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
Fix makefs bootstrap after d485c77f20
The makefs msdosfs code includes fs/msdosfs/denode.h which directly uses struct buf from <sys/buf.h> 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
This commit is contained in:
parent
6895f89fe5
commit
ba2cfa80e1
|
@ -40,6 +40,7 @@
|
|||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/buf.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/vnode.h>
|
||||
|
|
|
@ -52,8 +52,6 @@
|
|||
#ifndef _FS_MSDOSFS_DENODE_H_
|
||||
#define _FS_MSDOSFS_DENODE_H_
|
||||
|
||||
#include <sys/buf.h>
|
||||
|
||||
/*
|
||||
* This is the pc filesystem specific portion of the vnode structure.
|
||||
*
|
||||
|
|
|
@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
|
|||
#include <mkfs_msdos.h>
|
||||
#include <fs/msdosfs/bpb.h>
|
||||
#include "msdos/direntry.h"
|
||||
#include <fs/msdosfs/denode.h>
|
||||
#include "msdos/denode.h"
|
||||
#include <fs/msdosfs/msdosfsmount.h>
|
||||
|
||||
#undef clrbuf
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
} while (0);
|
||||
|
||||
|
||||
struct vnode;
|
||||
struct denode;
|
||||
struct fsnode;
|
||||
struct msdosfsmount;
|
||||
|
|
39
usr.sbin/makefs/msdos/denode.h
Normal file
39
usr.sbin/makefs/msdos/denode.h
Normal file
|
@ -0,0 +1,39 @@
|
|||
/*-
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*
|
||||
* Copyright 2018-2020 Alex Richardson <arichardson@FreeBSD.org>
|
||||
*
|
||||
* 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 <fs/msdosfs/denode.h>
|
|
@ -62,13 +62,10 @@ __FBSDID("$FreeBSD$");
|
|||
#include <util.h>
|
||||
|
||||
#include <fs/msdosfs/bpb.h>
|
||||
#include <fs/msdosfs/direntry.h>
|
||||
#include <fs/msdosfs/denode.h>
|
||||
#include "msdos/denode.h"
|
||||
#include <fs/msdosfs/fat.h>
|
||||
#include <fs/msdosfs/msdosfsmount.h>
|
||||
|
||||
#undef clrbuf
|
||||
#include "ffs/buf.h"
|
||||
#include "makefs.h"
|
||||
#include "msdos.h"
|
||||
|
||||
|
|
|
@ -60,13 +60,10 @@
|
|||
#include <strings.h>
|
||||
|
||||
#include <fs/msdosfs/bpb.h>
|
||||
#include "msdos/direntry.h"
|
||||
#include <fs/msdosfs/denode.h>
|
||||
#include "msdos/denode.h"
|
||||
#include <fs/msdosfs/fat.h>
|
||||
#include <fs/msdosfs/msdosfsmount.h>
|
||||
|
||||
#undef clrbuf
|
||||
#include "ffs/buf.h"
|
||||
#include "makefs.h"
|
||||
#include "msdos.h"
|
||||
|
||||
|
|
|
@ -58,13 +58,10 @@
|
|||
#include <string.h>
|
||||
|
||||
#include <fs/msdosfs/bpb.h>
|
||||
#include "msdos/direntry.h"
|
||||
#include <fs/msdosfs/denode.h>
|
||||
#include "msdos/denode.h"
|
||||
#include <fs/msdosfs/fat.h>
|
||||
#include <fs/msdosfs/msdosfsmount.h>
|
||||
|
||||
#undef clrbuf
|
||||
#include "ffs/buf.h"
|
||||
#include "makefs.h"
|
||||
#include "msdos.h"
|
||||
|
||||
|
|
|
@ -63,15 +63,12 @@ __FBSDID("$FreeBSD$");
|
|||
|
||||
#include <fs/msdosfs/bootsect.h>
|
||||
#include <fs/msdosfs/bpb.h>
|
||||
#include "msdos/direntry.h"
|
||||
#include <fs/msdosfs/denode.h>
|
||||
#include "msdos/denode.h"
|
||||
#include <fs/msdosfs/fat.h>
|
||||
#include <fs/msdosfs/msdosfsmount.h>
|
||||
|
||||
#include <mkfs_msdos.h>
|
||||
|
||||
#undef clrbuf
|
||||
#include "ffs/buf.h"
|
||||
#include "makefs.h"
|
||||
#include "msdos.h"
|
||||
|
||||
|
|
|
@ -65,13 +65,10 @@ __FBSDID("$FreeBSD$");
|
|||
#include <unistd.h>
|
||||
|
||||
#include <fs/msdosfs/bpb.h>
|
||||
#include "msdos/direntry.h"
|
||||
#include <fs/msdosfs/denode.h>
|
||||
#include "msdos/denode.h"
|
||||
#include <fs/msdosfs/fat.h>
|
||||
#include <fs/msdosfs/msdosfsmount.h>
|
||||
|
||||
#undef clrbuf
|
||||
#include "ffs/buf.h"
|
||||
#include "makefs.h"
|
||||
#include "msdos.h"
|
||||
|
||||
|
|
30
usr.sbin/makefs/sys/buf.h
Normal file
30
usr.sbin/makefs/sys/buf.h
Normal file
|
@ -0,0 +1,30 @@
|
|||
/*-
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*
|
||||
* Copyright 2018-2020 Alex Richardson <arichardson@FreeBSD.org>
|
||||
*
|
||||
* 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 "<sys/buf.h> should not be included by makefs"
|
Loading…
Reference in a new issue