summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2011-06-13 16:05:41 +0000
committerdim <dim@FreeBSD.org>2011-06-13 16:05:41 +0000
commitaccb907d3b1dc4a3805878935fb2d1b9724122e4 (patch)
tree8c854c85df61cc0848d240919d32c2ed4d0e5d2d /usr.sbin
parent14a87d82fdaf6a248dd591005bd871a79d6a609c (diff)
downloadFreeBSD-src-accb907d3b1dc4a3805878935fb2d1b9724122e4.zip
FreeBSD-src-accb907d3b1dc4a3805878935fb2d1b9724122e4.tar.gz
Use alternative, less messy solution to avoid breakage after r223020:
put the snapdata structure between #ifdef _KERNEL guards. Suggested by: kib
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/makefs/ffs/ffs_bswap.c3
-rw-r--r--usr.sbin/makefs/ffs/ffs_subr.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/usr.sbin/makefs/ffs/ffs_bswap.c b/usr.sbin/makefs/ffs/ffs_bswap.c
index 7049991..18ace03 100644
--- a/usr.sbin/makefs/ffs/ffs_bswap.c
+++ b/usr.sbin/makefs/ffs/ffs_bswap.c
@@ -34,9 +34,6 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/lock.h>
-#include <sys/lockmgr.h>
#if defined(_KERNEL)
#include <sys/systm.h>
#endif
diff --git a/usr.sbin/makefs/ffs/ffs_subr.c b/usr.sbin/makefs/ffs/ffs_subr.c
index 19d3543..5f9b6f2 100644
--- a/usr.sbin/makefs/ffs/ffs_subr.c
+++ b/usr.sbin/makefs/ffs/ffs_subr.c
@@ -35,9 +35,6 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/lock.h>
-#include <sys/lockmgr.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
OpenPOWER on IntegriCloud