aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2021-02-18 13:43:58 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2021-02-21 09:38:21 +0000
commitd485c77f203fb0f4cdc08dea5ff81631b51d8809 (patch)
treeedaccf839fb300b07f445a8d463544e6f472db91 /lib
parent750ea20d3fb143a95ccf3ff84cfbe86cce9b9cac (diff)
Diffstat (limited to 'lib')
-rw-r--r--lib/libprocstat/common_kvm.c3
-rw-r--r--lib/libprocstat/libprocstat.c5
-rw-r--r--lib/libprocstat/zfs_defs.c2
-rw-r--r--lib/libufs/block.c2
-rw-r--r--lib/libufs/cgroup.c2
-rw-r--r--lib/libufs/inode.c2
-rw-r--r--lib/libufs/sblock.c2
-rw-r--r--lib/libufs/type.c2
8 files changed, 13 insertions, 7 deletions
diff --git a/lib/libprocstat/common_kvm.c b/lib/libprocstat/common_kvm.c
index 2889f802775d..0ce2a2900f66 100644
--- a/lib/libprocstat/common_kvm.c
+++ b/lib/libprocstat/common_kvm.c
@@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$");
#include <sys/stat.h>
#include <sys/vnode.h>
#include <sys/conf.h>
-#define _KERNEL
#include <sys/pipe.h>
+#define _WANT_MOUNT
#include <sys/mount.h>
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
#include <ufs/ufs/ufsmount.h>
#include <fs/devfs/devfs.h>
#include <fs/devfs/devfs_int.h>
-#undef _KERNEL
#include <nfs/nfsproto.h>
#include <nfsclient/nfs.h>
#include <nfsclient/nfsnode.h>
diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c
index a2de61855815..7ccf6c343705 100644
--- a/lib/libprocstat/libprocstat.c
+++ b/lib/libprocstat/libprocstat.c
@@ -68,15 +68,12 @@ __FBSDID("$FreeBSD$");
#include <sys/mman.h>
#include <sys/capsicum.h>
#include <sys/ptrace.h>
-#define _KERNEL
+#define _WANT_MOUNT
#include <sys/mount.h>
#include <sys/filedesc.h>
#include <sys/pipe.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
#include <fs/devfs/devfs.h>
#include <fs/devfs/devfs_int.h>
-#undef _KERNEL
#include <nfs/nfsproto.h>
#include <nfsclient/nfs.h>
#include <nfsclient/nfsnode.h>
diff --git a/lib/libprocstat/zfs_defs.c b/lib/libprocstat/zfs_defs.c
index c41054f05136..66acef743dc4 100644
--- a/lib/libprocstat/zfs_defs.c
+++ b/lib/libprocstat/zfs_defs.c
@@ -71,7 +71,7 @@ struct vattr {
long va_spare; /* remain quad aligned */
};
-
+#define _WANT_MOUNT
#include <sys/zfs_context.h>
#include <sys/zfs_znode.h>
diff --git a/lib/libufs/block.c b/lib/libufs/block.c
index 7accc8863693..3c99d288a402 100644
--- a/lib/libufs/block.c
+++ b/lib/libufs/block.c
@@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$");
#include <sys/disklabel.h>
#include <sys/stat.h>
+#include <ufs/ufs/extattr.h>
+#include <ufs/ufs/quota.h>
#include <ufs/ufs/ufsmount.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
diff --git a/lib/libufs/cgroup.c b/lib/libufs/cgroup.c
index 1c3e271c4295..90b28eadad2c 100644
--- a/lib/libufs/cgroup.c
+++ b/lib/libufs/cgroup.c
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
#include <sys/disklabel.h>
#include <sys/stat.h>
+#include <ufs/ufs/extattr.h>
+#include <ufs/ufs/quota.h>
#include <ufs/ufs/ufsmount.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
diff --git a/lib/libufs/inode.c b/lib/libufs/inode.c
index 497ff4c854f6..c4a0cab9e95a 100644
--- a/lib/libufs/inode.c
+++ b/lib/libufs/inode.c
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
#include <sys/disklabel.h>
#include <sys/stat.h>
+#include <ufs/ufs/extattr.h>
+#include <ufs/ufs/quota.h>
#include <ufs/ufs/ufsmount.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
diff --git a/lib/libufs/sblock.c b/lib/libufs/sblock.c
index 1d687d6d41aa..3b65e79b02b5 100644
--- a/lib/libufs/sblock.c
+++ b/lib/libufs/sblock.c
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
#include <sys/disklabel.h>
#include <sys/stat.h>
+#include <ufs/ufs/extattr.h>
+#include <ufs/ufs/quota.h>
#include <ufs/ufs/ufsmount.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
diff --git a/lib/libufs/type.c b/lib/libufs/type.c
index 653ef8ceeea1..a060f8ec5abf 100644
--- a/lib/libufs/type.c
+++ b/lib/libufs/type.c
@@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$");
#include <sys/disklabel.h>
#include <sys/stat.h>
+#include <ufs/ufs/extattr.h>
+#include <ufs/ufs/quota.h>
#include <ufs/ufs/ufsmount.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>