aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Richardson <arichardson@FreeBSD.org>2021-02-22 17:49:05 +0000
committerAlex Richardson <arichardson@FreeBSD.org>2021-02-22 17:55:45 +0000
commitba2cfa80e1f2a7e8ffd383e615aa304afa349ed7 (patch)
tree66751d54ef2ac7ed55e0d66c812eedc947a7934e
parent6895f89fe54e0858aea70d2bd2a9651f45d7998e (diff)
downloadsrc-ba2cfa80e1f2a7e8ffd383e615aa304afa349ed7.tar.gz
src-ba2cfa80e1f2a7e8ffd383e615aa304afa349ed7.zip
Fix makefs bootstrap after d485c77f203fb0f4cdc08dea5ff81631b51d8809
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
-rw-r--r--lib/libprocstat/msdosfs.c1
-rw-r--r--sys/fs/msdosfs/denode.h2
-rw-r--r--usr.sbin/makefs/msdos.c2
-rw-r--r--usr.sbin/makefs/msdos.h1
-rw-r--r--usr.sbin/makefs/msdos/denode.h39
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_denode.c5
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_fat.c5
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_lookup.c5
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_vfsops.c5
-rw-r--r--usr.sbin/makefs/msdos/msdosfs_vnops.c5
-rw-r--r--usr.sbin/makefs/sys/buf.h30
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 <sys/param.h>
+#include <sys/buf.h>
#include <sys/time.h>
#include <sys/stat.h>
#include <sys/vnode.h>
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 <sys/buf.h>
-
/*
* 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 <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
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 <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>
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 <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"
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 <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"
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 <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"
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 <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"
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 <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"
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 <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"