From 13438f6823e991fe0c5616bc3a6f766a0a86c210 Mon Sep 17 00:00:00 2001 From: Alfred Perlstein Date: Wed, 1 Jan 2003 01:56:19 +0000 Subject: [PATCH] When compiling the kernel do not implicitly include filedesc.h from proc.h, this was causing filedesc work to be very painful. In order to make this work split out sigio definitions to thier own header (sigio.h) which is included from proc.h for the time being. --- sys/dev/raidframe/rf_freebsdkintf.c | 1 + sys/kern/kern_acl.c | 1 + sys/kern/kern_event.c | 1 + sys/kern/subr_acl_posix1e.c | 1 + sys/kern/sys_socket.c | 2 + sys/kern/vfs_acl.c | 1 + sys/kern/vfs_mount.c | 1 + sys/netsmb/smb_dev.c | 1 + sys/sys/filedesc.h | 30 ------------ sys/sys/proc.h | 5 ++ sys/sys/sigio.h | 71 +++++++++++++++++++++++++++++ sys/ufs/ffs/ffs_alloc.c | 1 + 12 files changed, 86 insertions(+), 30 deletions(-) create mode 100644 sys/sys/sigio.h diff --git a/sys/dev/raidframe/rf_freebsdkintf.c b/sys/dev/raidframe/rf_freebsdkintf.c index 77fd13ca7237..1a0665945b79 100644 --- a/sys/dev/raidframe/rf_freebsdkintf.c +++ b/sys/dev/raidframe/rf_freebsdkintf.c @@ -149,6 +149,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/kern/kern_acl.c b/sys/kern/kern_acl.c index 766c62da184c..3b48a82a6b1f 100644 --- a/sys/kern/kern_acl.c +++ b/sys/kern/kern_acl.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 4c8e6d00fd93..a6d0eb10e405 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/kern/subr_acl_posix1e.c b/sys/kern/subr_acl_posix1e.c index 766c62da184c..3b48a82a6b1f 100644 --- a/sys/kern/subr_acl_posix1e.c +++ b/sys/kern/subr_acl_posix1e.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 563224a192d4..c31a90313c4b 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -39,8 +39,10 @@ #include #include #include +#include #include #include +#include #include #include #include /* XXX */ diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index 766c62da184c..3b48a82a6b1f 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 5fa039981fe2..a5e5989e320e 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/netsmb/smb_dev.c b/sys/netsmb/smb_dev.c index f020b2c8141c..9a132aad2c8c 100644 --- a/sys/netsmb/smb_dev.c +++ b/sys/netsmb/smb_dev.c @@ -40,6 +40,7 @@ #include #include #include /* Must come after sys/malloc.h */ +#include #include #include #include diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h index 254540c4304b..a44281b1c584 100644 --- a/sys/sys/filedesc.h +++ b/sys/sys/filedesc.h @@ -104,32 +104,6 @@ struct filedesc0 { */ #define OFILESIZE (sizeof(struct file *) + sizeof(char)) -/* - * This structure holds the information needed to send a SIGIO or - * a SIGURG signal to a process or process group when new data arrives - * on a device or socket. The structure is placed on an SLIST belonging - * to the proc or pgrp so that the entire list may be revoked when the - * process exits or the process group disappears. - * - * (c) const - * (pg) locked by either the process or process group lock - */ -struct sigio { - union { - struct proc *siu_proc; /* (c) process to receive SIGIO/SIGURG */ - struct pgrp *siu_pgrp; /* (c) process group to receive ... */ - } sio_u; - SLIST_ENTRY(sigio) sio_pgsigio; /* (pg) sigio's for process or group */ - struct sigio **sio_myref; /* (c) location of the pointer that holds - * the reference to this structure */ - struct ucred *sio_ucred; /* (c) current credentials */ - pid_t sio_pgid; /* (c) pgid for signals */ -}; -#define sio_proc sio_u.siu_proc -#define sio_pgrp sio_u.siu_pgrp - -SLIST_HEAD(sigiolst, sigio); - #ifdef _KERNEL #define FILEDESC_LOCK_DESC "filedesc structure" @@ -154,10 +128,6 @@ struct filedesc *fdinit(struct filedesc *fdp); struct filedesc *fdshare(struct filedesc *fdp); void ffree(struct file *fp); static __inline struct file * fget_locked(struct filedesc *fdp, int fd); -pid_t fgetown(struct sigio **sigiop); -int fsetown(pid_t pgid, struct sigio **sigiop); -void funsetown(struct sigio **sigiop); -void funsetownlst(struct sigiolst *sigiolst); int getvnode(struct filedesc *fdp, int fd, struct file **fpp); void setugidsafety(struct thread *td); diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 52c8060a2d3c..9f46569084be 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -44,11 +44,16 @@ #include /* For struct callout. */ #include /* For struct klist. */ +#ifndef _KERNEL #include +#endif +#include +#include #include #include #include /* XXX */ #include +#include #include #include #ifndef _KERNEL diff --git a/sys/sys/sigio.h b/sys/sys/sigio.h new file mode 100644 index 000000000000..939748c0068b --- /dev/null +++ b/sys/sys/sigio.h @@ -0,0 +1,71 @@ +/* + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)filedesc.h 8.1 (Berkeley) 6/2/93 + * $FreeBSD$ + */ + +#ifndef _SYS_SIGIO_H_ +#define _SYS_SIGIO_H_ + +/* + * This structure holds the information needed to send a SIGIO or + * a SIGURG signal to a process or process group when new data arrives + * on a device or socket. The structure is placed on an SLIST belonging + * to the proc or pgrp so that the entire list may be revoked when the + * process exits or the process group disappears. + * + * (c) const + * (pg) locked by either the process or process group lock + */ +struct sigio { + union { + struct proc *siu_proc; /* (c) process to receive SIGIO/SIGURG */ + struct pgrp *siu_pgrp; /* (c) process group to receive ... */ + } sio_u; + SLIST_ENTRY(sigio) sio_pgsigio; /* (pg) sigio's for process or group */ + struct sigio **sio_myref; /* (c) location of the pointer that holds + * the reference to this structure */ + struct ucred *sio_ucred; /* (c) current credentials */ + pid_t sio_pgid; /* (c) pgid for signals */ +}; +#define sio_proc sio_u.siu_proc +#define sio_pgrp sio_u.siu_pgrp + +SLIST_HEAD(sigiolst, sigio); + +pid_t fgetown(struct sigio **sigiop); +int fsetown(pid_t pgid, struct sigio **sigiop); +void funsetown(struct sigio **sigiop); +void funsetownlst(struct sigiolst *sigiolst); + +#endif /* _SYS_SIGIO_H_ */ diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 322e39001f15..21ac648dda33 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include