From owner-svn-src-head@FreeBSD.ORG  Mon Jun 13 16:05:41 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E633C106566C;
	Mon, 13 Jun 2011 16:05:41 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D69658FC1B;
	Mon, 13 Jun 2011 16:05:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5DG5f25089447;
	Mon, 13 Jun 2011 16:05:41 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5DG5fvp089443;
	Mon, 13 Jun 2011 16:05:41 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201106131605.p5DG5fvp089443@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 13 Jun 2011 16:05:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223052 - in head: sys/ufs/ffs usr.sbin/makefs/ffs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jun 2011 16:05:42 -0000

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>