svn commit: r223052 - in head: sys/ufs/ffs usr.sbin/makefs/ffs

[Dimitry Andric]

Author: dim
Date: Mon Jun 13 16:05:41 2011
New Revision: 223052
URL: http://svn.freebsd.org/changeset/base/223052

Log:
  Use alternative, less messy solution to avoid breakage after r223020:
  put the snapdata structure between #ifdef _KERNEL guards.
  
  Suggested by:	kib

Modified:
  head/sys/ufs/ffs/ffs_extern.h
  head/usr.sbin/makefs/ffs/ffs_bswap.c
  head/usr.sbin/makefs/ffs/ffs_subr.c

Modified: head/sys/ufs/ffs/ffs_extern.h
==============================================================================
--- head/sys/ufs/ffs/ffs_extern.h	Mon Jun 13 15:59:21 2011	(r223051)
+++ head/sys/ufs/ffs/ffs_extern.h	Mon Jun 13 16:05:41 2011	(r223052)
@@ -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 */

Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c
==============================================================================
--- head/usr.sbin/makefs/ffs/ffs_bswap.c	Mon Jun 13 15:59:21 2011	(r223051)
+++ head/usr.sbin/makefs/ffs/ffs_bswap.c	Mon Jun 13 16:05:41 2011	(r223052)
@@ -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

Modified: head/usr.sbin/makefs/ffs/ffs_subr.c
==============================================================================
--- head/usr.sbin/makefs/ffs/ffs_subr.c	Mon Jun 13 15:59:21 2011	(r223051)
+++ head/usr.sbin/makefs/ffs/ffs_subr.c	Mon Jun 13 16:05:41 2011	(r223052)
@@ -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>