d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include <sys/conf.h> for the kernel in disk-related headers.

Browse Source 
It is needed for implementation details but very little of it is
needed for the interface.  Include it in the few places that didn't
already include it.

Include <sys/ioccom.h> in <sys/disklabel.h> (as already in
<sys/diskslice.h>) so that all the disk-related headers are almost
self-sufficient.
This commit is contained in:
Bruce Evans 1996-09-20 17:39:44 +00:00
parent ec55e44ec8
commit 253c0899b2
11 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/i386/isa/diskslice_machdep.c
View File

@ -35,12 +35,13 @@
*
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
* $Id: diskslice_machdep.c,v 1.19 1996/03/02 01:49:38 dyson Exp $
* $Id: diskslice_machdep.c,v 1.20 1996/04/07 17:32:09 bde Exp $
*/
#include <stddef.h>
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/disklabel.h>
#define DOSPTYP_EXTENDED 5
#define DOSPTYP_ONTRACK 84

3
sys/kern/subr_disklabel.c
View File

@ -36,12 +36,13 @@
* SUCH DAMAGE.
*
* @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94
* $Id: ufs_disksubr.c,v 1.24 1996/05/03 15:05:17 phk Exp $
* $Id: ufs_disksubr.c,v 1.25 1996/05/08 04:29:08 gpalmer Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/disklabel.h>
#include <sys/diskslice.h>
#include <sys/syslog.h>

3
sys/kern/subr_diskmbr.c
View File

@ -35,12 +35,13 @@
*
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
* $Id: diskslice_machdep.c,v 1.19 1996/03/02 01:49:38 dyson Exp $
* $Id: diskslice_machdep.c,v 1.20 1996/04/07 17:32:09 bde Exp $
*/
#include <stddef.h>
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/disklabel.h>
#define DOSPTYP_EXTENDED 5
#define DOSPTYP_ONTRACK 84

3
sys/kern/subr_diskslice.c
View File

@ -43,11 +43,12 @@
* from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
* $Id: subr_diskslice.c,v 1.27 1996/06/17 14:43:45 bde Exp $
* $Id: subr_diskslice.c,v 1.28 1996/08/02 06:14:25 peter Exp $
*/
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/conf.h>
#ifdef DEVFS
#include <sys/devfsext.h>
#endif

3
sys/kern/subr_dkbad.c
View File

@ -43,11 +43,12 @@
* from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
* $Id$
* $Id: subr_dkbad.c,v 1.3 1996/09/14 01:04:18 bde Exp $
*/
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/disklabel.h>
#include <sys/dkbad.h>
#include <sys/malloc.h>

12
sys/sys/disklabel.h
View File

@ -31,12 +31,14 @@
* SUCH DAMAGE.
*
* @(#)disklabel.h 8.2 (Berkeley) 7/10/94
* $Id: disklabel.h,v 1.21 1996/05/03 05:38:34 asami Exp $
* $Id: disklabel.h,v 1.22 1996/06/14 11:02:27 asami Exp $
*/
#ifndef _SYS_DISKLABEL_H_
#define _SYS_DISKLABEL_H_
#include <sys/ioccom.h>
/*
* Disk description table, see disktab(5)
*/
@ -420,10 +422,6 @@ struct dos_partition {
#define dkunit(dev) ((minor(dev) >> 3) & 0x1f)
#ifdef KERNEL
/*
* We're not ready to use <sys/disk.h>.
*/
#include <sys/conf.h>
struct buf_queue_head;
@ -433,12 +431,12 @@ void diskerr __P((struct buf *bp, char *dname, char *what, int pri,
int blkdone, struct disklabel *lp));
void disksort __P((struct buf *ap, struct buf *bp));
u_int dkcksum __P((struct disklabel *lp));
char *readdisklabel __P((dev_t dev, d_strategy_t *strat,
char *readdisklabel __P((dev_t dev, void (*strat)(struct buf *bp),
struct disklabel *lp));
void tqdisksort __P((struct buf_queue_head *ap, struct buf *bp));
int setdisklabel __P((struct disklabel *olp, struct disklabel *nlp,
u_long openmask));
int writedisklabel __P((dev_t dev, d_strategy_t *strat,
int writedisklabel __P((dev_t dev, void (*strat)(struct buf *bp),
struct disklabel *lp));
#endif /* KERNEL */

12
sys/sys/diskmbr.h
View File

@ -31,12 +31,14 @@
* SUCH DAMAGE.
*
* @(#)disklabel.h 8.2 (Berkeley) 7/10/94
* $Id: disklabel.h,v 1.21 1996/05/03 05:38:34 asami Exp $
* $Id: disklabel.h,v 1.22 1996/06/14 11:02:27 asami Exp $
*/
#ifndef _SYS_DISKLABEL_H_
#define _SYS_DISKLABEL_H_
#include <sys/ioccom.h>
/*
* Disk description table, see disktab(5)
*/
@ -420,10 +422,6 @@ struct dos_partition {
#define dkunit(dev) ((minor(dev) >> 3) & 0x1f)
#ifdef KERNEL
/*
* We're not ready to use <sys/disk.h>.
*/
#include <sys/conf.h>
struct buf_queue_head;
@ -433,12 +431,12 @@ void diskerr __P((struct buf *bp, char *dname, char *what, int pri,
int blkdone, struct disklabel *lp));
void disksort __P((struct buf *ap, struct buf *bp));
u_int dkcksum __P((struct disklabel *lp));
char *readdisklabel __P((dev_t dev, d_strategy_t *strat,
char *readdisklabel __P((dev_t dev, void (*strat)(struct buf *bp),
struct disklabel *lp));
void tqdisksort __P((struct buf_queue_head *ap, struct buf *bp));
int setdisklabel __P((struct disklabel *olp, struct disklabel *nlp,
u_long openmask));
int writedisklabel __P((dev_t dev, d_strategy_t *strat,
int writedisklabel __P((dev_t dev, void (*strat)(struct buf *bp),
struct disklabel *lp));
#endif /* KERNEL */

12
sys/sys/diskpc98.h
View File

@ -31,12 +31,14 @@
* SUCH DAMAGE.
*
* @(#)disklabel.h 8.2 (Berkeley) 7/10/94
* $Id: disklabel.h,v 1.21 1996/05/03 05:38:34 asami Exp $
* $Id: disklabel.h,v 1.22 1996/06/14 11:02:27 asami Exp $
*/
#ifndef _SYS_DISKLABEL_H_
#define _SYS_DISKLABEL_H_
#include <sys/ioccom.h>
/*
* Disk description table, see disktab(5)
*/
@ -420,10 +422,6 @@ struct dos_partition {
#define dkunit(dev) ((minor(dev) >> 3) & 0x1f)
#ifdef KERNEL
/*
* We're not ready to use <sys/disk.h>.
*/
#include <sys/conf.h>
struct buf_queue_head;
@ -433,12 +431,12 @@ void diskerr __P((struct buf *bp, char *dname, char *what, int pri,
int blkdone, struct disklabel *lp));
void disksort __P((struct buf *ap, struct buf *bp));
u_int dkcksum __P((struct disklabel *lp));
char *readdisklabel __P((dev_t dev, d_strategy_t *strat,
char *readdisklabel __P((dev_t dev, void (*strat)(struct buf *bp),
struct disklabel *lp));
void tqdisksort __P((struct buf_queue_head *ap, struct buf *bp));
int setdisklabel __P((struct disklabel *olp, struct disklabel *nlp,
u_long openmask));
int writedisklabel __P((dev_t dev, d_strategy_t *strat,
int writedisklabel __P((dev_t dev, void (*strat)(struct buf *bp),
struct disklabel *lp));
#endif /* KERNEL */

17
sys/sys/diskslice.h
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: diskslice.h,v 1.13 1996/06/14 11:02:28 asami Exp $
* $Id: diskslice.h,v 1.14 1996/07/23 07:46:59 asami Exp $
*/
#ifndef _SYS_DISKSLICE_H_
@ -110,8 +110,6 @@ struct diskslices {
#ifdef KERNEL
#include <sys/conf.h>
#define dsgetbad(dev, ssp) (ssp->dss_slices[dkslice(dev)].ds_bad)
#define dsgetlabel(dev, ssp) (ssp->dss_slices[dkslice(dev)].ds_label)
@ -123,20 +121,23 @@ typedef int ds_setgeom_t __P((struct disklabel *lp));
int dscheck __P((struct buf *bp, struct diskslices *ssp));
void dsclose __P((dev_t dev, int mode, struct diskslices *ssp));
void dsgone __P((struct diskslices **sspp));
int dsinit __P((char *dname, dev_t dev, d_strategy_t *strat,
int dsinit __P((char *dname, dev_t dev, void (*strat)(struct buf *bp),
struct disklabel *lp, struct diskslices **sspp));
int dsioctl __P((char *dname, dev_t dev, int cmd, caddr_t data, int flags,
struct diskslices **sspp, d_strategy_t *strat,
struct diskslices **sspp, void (*strat)(struct buf *bp),
ds_setgeom_t *setgeom));
int dsisopen __P((struct diskslices *ssp));
char *dsname __P((char *dname, int unit, int slice, int part,
char *partname));
int dsopen __P((char *dname, dev_t dev, int mode, struct diskslices **sspp,
struct disklabel *lp, d_strategy_t *strat,
struct disklabel *lp, void (*strat)(struct buf *bp),
ds_setgeom_t *setgeom, struct bdevsw *bdevsw,
struct cdevsw *cdevsw));
int dssize __P((dev_t dev, struct diskslices **sspp, d_open_t dopen,
d_close_t dclose));
int dssize __P((dev_t dev, struct diskslices **sspp,
int (*dopen)(dev_t dev, int oflags, int devtype,
struct proc *p),
int (*dclose)(dev_t dev, int fflag, int devtype,
struct proc *p)));
#endif /* KERNEL */

6
sys/sys/dkbad.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)dkbad.h 8.2 (Berkeley) 7/10/94
* $Id: dkbad.h,v 1.6 1996/02/24 05:25:02 hsu Exp $
* $Id: dkbad.h,v 1.6 1996/03/11 02:07:37 hsu Exp $
*/
#ifndef _SYS_DKBAD_H_
@ -78,8 +78,6 @@ struct dkbad {
#define CONT 3
#ifdef KERNEL
#include <sys/conf.h>
#define DKBAD_NOSECT (-1) /* sector to mark end of core table */
struct dkbad_intern {
@ -92,7 +90,7 @@ struct disklabel;
struct dkbad_intern *internbad144 __P((struct dkbad *btp,
struct disklabel *lp));
char *readbad144 __P((dev_t dev, d_strategy_t *strat,
char *readbad144 __P((dev_t dev, void (*strat)(struct buf *bp),
struct disklabel *lp, struct dkbad *btp));
daddr_t transbad144 __P((struct dkbad_intern *bip, daddr_t blkno));
#endif

3
sys/ufs/ufs/ufs_disksubr.c
View File

@ -36,12 +36,13 @@
* SUCH DAMAGE.
*
* @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94
* $Id: ufs_disksubr.c,v 1.24 1996/05/03 15:05:17 phk Exp $
* $Id: ufs_disksubr.c,v 1.25 1996/05/08 04:29:08 gpalmer Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/disklabel.h>
#include <sys/diskslice.h>
#include <sys/syslog.h>