diff options
| author | dim <dim@FreeBSD.org> | 2011-06-13 16:05:41 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2011-06-13 16:05:41 +0000 |
| commit | accb907d3b1dc4a3805878935fb2d1b9724122e4 (patch) | |
| tree | 8c854c85df61cc0848d240919d32c2ed4d0e5d2d | |
| parent | 14a87d82fdaf6a248dd591005bd871a79d6a609c (diff) | |
| download | FreeBSD-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
| -rw-r--r-- | sys/ufs/ffs/ffs_extern.h | 2 | ||||
| -rw-r--r-- | usr.sbin/makefs/ffs/ffs_bswap.c | 3 | ||||
| -rw-r--r-- | usr.sbin/makefs/ffs/ffs_subr.c | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index fbda5a8..75f9d38 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -166,6 +166,7 @@ void softdep_freework(struct workhead *); int ffs_rdonly(struct inode *); +#ifdef _KERNEL TAILQ_HEAD(snaphead, inode); struct snapdata { @@ -175,5 +176,6 @@ struct snapdata { daddr_t *sn_blklist; struct lock sn_lock; }; +#endif /* _KERNEL */ #endif /* !_UFS_FFS_EXTERN_H */ 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> |
