Don't include <sys/lock.h> in headers when only `struct simplelock' is

required.  Fixed everything that depended on the pollution.
This commit is contained in:
Bruce Evans 1997-12-05 19:55:52 +00:00
parent 188da0efe1
commit 1cd52ec333
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=31561
29 changed files with 52 additions and 25 deletions

View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: linux_file.c,v 1.14 1997/04/06 10:10:50 dfr Exp $
* $Id: linux_file.c,v 1.15 1997/11/06 19:28:54 phk Exp $
*/
#include <sys/param.h>
@ -34,6 +34,7 @@
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/filedesc.h>
#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/malloc.h>

View File

@ -31,12 +31,13 @@
* SUCH DAMAGE.
*
* @(#)dead_vnops.c 8.1 (Berkeley) 6/10/93
* $Id: dead_vnops.c,v 1.20 1997/10/16 21:59:55 phk Exp $
* $Id: dead_vnops.c,v 1.21 1997/10/26 20:55:10 phk Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/vnode.h>
#include <sys/buf.h>

View File

@ -31,12 +31,13 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95
* $Id: fifo_vnops.c,v 1.36 1997/10/27 13:33:39 bde Exp $
* $Id: fifo_vnops.c,v 1.37 1997/10/27 15:33:04 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/socket.h>

View File

@ -36,7 +36,7 @@
*
* @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95
*
* $Id: procfs_vnops.c,v 1.41 1997/10/27 15:39:01 bde Exp $
* $Id: procfs_vnops.c,v 1.42 1997/11/07 08:53:15 phk Exp $
*/
/*
@ -47,6 +47,7 @@
#include <sys/systm.h>
#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/fcntl.h>
#include <sys/proc.h>
#include <sys/vnode.h>

View File

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

View File

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

View File

@ -26,6 +26,7 @@
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/lock.h>
#include <sys/stat.h>
#include <sys/vnode.h>

View File

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

View File

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

View File

@ -26,6 +26,7 @@
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/lock.h>
#include <sys/stat.h>
#include <sys/vnode.h>

View File

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

View File

@ -45,7 +45,7 @@
*
* @(#)sun_misc.c 8.1 (Berkeley) 6/18/93
*
* $Id: ibcs2_misc.c,v 1.23 1997/08/25 21:56:23 bde Exp $
* $Id: ibcs2_misc.c,v 1.24 1997/11/06 19:28:33 phk Exp $
*/
/*
@ -60,6 +60,7 @@
#include <sys/file.h>
#include <sys/filedesc.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/reboot.h>
#include <sys/resourcevar.h>

View File

@ -28,7 +28,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: imgact_linux.c,v 1.23 1997/07/20 14:21:36 bde Exp $
* $Id: imgact_linux.c,v 1.24 1997/07/20 16:05:50 bde Exp $
*/
#include <sys/param.h>
@ -39,6 +39,7 @@
#include <sys/imgact.h>
#include <sys/imgact_aout.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/vnode.h>

View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: linux_file.c,v 1.14 1997/04/06 10:10:50 dfr Exp $
* $Id: linux_file.c,v 1.15 1997/11/06 19:28:54 phk Exp $
*/
#include <sys/param.h>
@ -34,6 +34,7 @@
#include <sys/fcntl.h>
#include <sys/file.h>
#include <sys/filedesc.h>
#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/malloc.h>

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93
* $Id: kern_ktrace.c,v 1.20 1997/10/12 20:23:48 phk Exp $
* $Id: kern_ktrace.c,v 1.21 1997/11/06 19:29:10 phk Exp $
*/
#include "opt_ktrace.h"
@ -41,6 +41,7 @@
#include <sys/sysproto.h>
#include <sys/proc.h>
#include <sys/fcntl.h>
#include <sys/lock.h>
#include <sys/namei.h>
#include <sys/vnode.h>
#include <sys/ktrace.h>

View File

@ -34,11 +34,12 @@
* SUCH DAMAGE.
*
* @(#)ufs_lockf.c 8.3 (Berkeley) 1/6/94
* $Id: kern_lockf.c,v 1.15 1997/10/11 18:31:23 phk Exp $
* $Id: kern_lockf.c,v 1.16 1997/10/12 20:23:49 phk Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/unistd.h>
#include <sys/vnode.h>

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tty_tty.c 8.2 (Berkeley) 9/23/93
* $Id: tty_tty.c,v 1.19 1997/09/16 11:43:35 bde Exp $
* $Id: tty_tty.c,v 1.20 1997/11/18 12:59:09 bde Exp $
*/
/*
@ -40,6 +40,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/lock.h>
#include <sys/proc.h>
#include <sys/ttycom.h>
#include <sys/vnode.h>

View File

@ -18,7 +18,7 @@
* 5. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id: vfs_bio.c,v 1.136 1997/12/01 19:04:00 dyson Exp $
* $Id: vfs_bio.c,v 1.137 1997/12/02 21:06:45 phk Exp $
*/
/*
@ -39,6 +39,7 @@
#include <sys/systm.h>
#include <sys/sysproto.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/sysctl.h>
#include <sys/proc.h>
#include <sys/vnode.h>

View File

@ -40,6 +40,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/unistd.h>
#include <sys/vnode.h>

View File

@ -31,12 +31,13 @@
* SUCH DAMAGE.
*
* @(#)dead_vnops.c 8.1 (Berkeley) 6/10/93
* $Id: dead_vnops.c,v 1.20 1997/10/16 21:59:55 phk Exp $
* $Id: dead_vnops.c,v 1.21 1997/10/26 20:55:10 phk Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/vnode.h>
#include <sys/buf.h>

View File

@ -1,7 +1,7 @@
/*
* Written by Julian Elischer (julian@DIALix.oz.au)
*
* $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.48 1997/10/27 13:33:37 bde Exp $
* $Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.49 1997/11/08 19:02:28 julian Exp $
*
* symlinks can wait 'til later.
*/
@ -10,6 +10,7 @@
#include <sys/systm.h>
#include <sys/namei.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/stat.h>
#include <sys/proc.h>
#include <sys/time.h>

View File

@ -31,12 +31,13 @@
* SUCH DAMAGE.
*
* @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95
* $Id: fifo_vnops.c,v 1.36 1997/10/27 13:33:39 bde Exp $
* $Id: fifo_vnops.c,v 1.37 1997/10/27 15:33:04 bde Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/socket.h>

View File

@ -36,7 +36,7 @@
*
* @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95
*
* $Id: procfs_vnops.c,v 1.41 1997/10/27 15:39:01 bde Exp $
* $Id: procfs_vnops.c,v 1.42 1997/11/07 08:53:15 phk Exp $
*/
/*
@ -47,6 +47,7 @@
#include <sys/systm.h>
#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/fcntl.h>
#include <sys/proc.h>
#include <sys/vnode.h>

View File

@ -31,15 +31,16 @@
* SUCH DAMAGE.
*
* @(#)vnode.h 8.7 (Berkeley) 2/4/94
* $Id: vnode.h,v 1.56 1997/11/18 09:26:50 bde Exp $
* $Id: vnode.h,v 1.57 1997/11/22 08:35:43 bde Exp $
*/
#ifndef _SYS_VNODE_H_
#define _SYS_VNODE_H_
#include <sys/lock.h>
#include <sys/queue.h>
#include <machine/lock.h>
/*
* The vnode is the focus of all file activity in UNIX. There is a
* unique vnode allocated for each active file, each current directory,

View File

@ -31,12 +31,13 @@
* SUCH DAMAGE.
*
* @(#)ffs_balloc.c 8.8 (Berkeley) 6/16/95
* $Id: ffs_balloc.c,v 1.14 1997/04/10 13:17:09 bde Exp $
* $Id: ffs_balloc.c,v 1.15 1997/08/02 14:33:18 bde Exp $
*/
#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>

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_subr.c 8.5 (Berkeley) 3/21/95
* $Id: ffs_subr.c,v 1.14 1997/11/18 15:10:38 bde Exp $
* $Id: ffs_subr.c,v 1.15 1997/11/22 08:35:46 bde Exp $
*/
#include <sys/param.h>
@ -43,6 +43,7 @@
#include "opt_ddb.h"
#include <sys/systm.h>
#include <sys/lock.h>
#include <sys/vnode.h>
#include <sys/buf.h>
#include <ufs/ufs/quota.h>

View File

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

View File

@ -18,12 +18,13 @@
* 5. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id: vm_zone.c,v 1.9 1997/10/11 18:31:40 phk Exp $
* $Id: vm_zone.c,v 1.10 1997/10/12 20:26:33 phk Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/sysctl.h>

View File

@ -18,7 +18,7 @@
* 5. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id: vm_zone.h,v 1.6 1997/09/21 04:24:27 dyson Exp $
* $Id: vm_zone.h,v 1.7 1997/09/21 11:41:12 peter Exp $
*/
#if !defined(_SYS_ZONE_H)
@ -28,8 +28,7 @@
#define ZONE_INTERRUPT 1 /* Use this if you need to allocate at int time */
#define ZONE_BOOT 16 /* This is an internal flag used by zbootinit */
#include <machine/param.h>
#include <sys/lock.h>
#include <machine/lock.h>
typedef struct vm_zone {
struct simplelock zlock; /* lock for data structure */