From 1cd52ec333dcaa93fed3408a4d473f1192c8aba8 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Fri, 5 Dec 1997 19:55:52 +0000
Subject: Don't include <sys/lock.h> in headers when only `struct simplelock'
 is required.  Fixed everything that depended on the pollution.

---
 sys/gnu/ext2fs/ext2_balloc.c       | 1 +
 sys/gnu/ext2fs/ext2_ihash.c        | 3 ++-
 sys/gnu/ext2fs/ext2_inode_cnv.c    | 1 +
 sys/gnu/ext2fs/ext2_subr.c         | 1 +
 sys/gnu/fs/ext2fs/ext2_balloc.c    | 1 +
 sys/gnu/fs/ext2fs/ext2_inode_cnv.c | 1 +
 sys/gnu/fs/ext2fs/ext2_subr.c      | 1 +
 7 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'sys/gnu')

diff --git a/sys/gnu/ext2fs/ext2_balloc.c b/sys/gnu/ext2fs/ext2_balloc.c
index f94c015a46e86..3d871239956c1 100644
--- a/sys/gnu/ext2fs/ext2_balloc.c
+++ b/sys/gnu/ext2fs/ext2_balloc.c
@@ -42,6 +42,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
+#include <sys/lock.h>
 #include <sys/vnode.h>
 
 #include <ufs/ufs/quota.h>
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c
index a34e8c8a360c3..644f47a9dfc13 100644
--- a/sys/gnu/ext2fs/ext2_ihash.c
+++ b/sys/gnu/ext2fs/ext2_ihash.c
@@ -31,11 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ufs_ihash.c,v 1.11 1997/10/14 18:51:07 phk Exp $
+ * $Id: ufs_ihash.c,v 1.12 1997/10/15 07:32:45 bde Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
diff --git a/sys/gnu/ext2fs/ext2_inode_cnv.c b/sys/gnu/ext2fs/ext2_inode_cnv.c
index 238772f6dd4d9..42ebd2b9bd64b 100644
--- a/sys/gnu/ext2fs/ext2_inode_cnv.c
+++ b/sys/gnu/ext2fs/ext2_inode_cnv.c
@@ -26,6 +26,7 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 
diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c
index 94d8d532a67a0..a70e445b0ee4d 100644
--- a/sys/gnu/ext2fs/ext2_subr.c
+++ b/sys/gnu/ext2fs/ext2_subr.c
@@ -43,6 +43,7 @@
 #include <gnu/ext2fs/ext2_fs_sb.h>
 #include <gnu/ext2fs/fs.h>
 
+#include <sys/lock.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <gnu/ext2fs/ext2_extern.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_balloc.c b/sys/gnu/fs/ext2fs/ext2_balloc.c
index f94c015a46e86..3d871239956c1 100644
--- a/sys/gnu/fs/ext2fs/ext2_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_balloc.c
@@ -42,6 +42,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
+#include <sys/lock.h>
 #include <sys/vnode.h>
 
 #include <ufs/ufs/quota.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
index 238772f6dd4d9..42ebd2b9bd64b 100644
--- a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
+++ b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c
@@ -26,6 +26,7 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index 94d8d532a67a0..a70e445b0ee4d 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -43,6 +43,7 @@
 #include <gnu/ext2fs/ext2_fs_sb.h>
 #include <gnu/ext2fs/fs.h>
 
+#include <sys/lock.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <gnu/ext2fs/ext2_extern.h>
-- 
cgit v1.3