d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use alternative, less messy solution to avoid breakage after r223020:

Browse Source 
put the snapdata structure between #ifdef _KERNEL guards.

Suggested by:	kib
This commit is contained in:
Dimitry Andric 2011-06-13 16:05:41 +00:00
parent 6b7c15e580
commit 222ef43340
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=223052
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/ufs/ffs/ffs_extern.h
View File

@ -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 */

3
usr.sbin/makefs/ffs/ffs_bswap.c
View File

@ -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

3
usr.sbin/makefs/ffs/ffs_subr.c
View File

@ -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>