summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/i386/isa/diskslice_machdep.c3
-rw-r--r--sys/kern/subr_disklabel.c3
-rw-r--r--sys/kern/subr_diskmbr.c3
-rw-r--r--sys/kern/subr_diskslice.c3
-rw-r--r--sys/kern/subr_dkbad.c3
-rw-r--r--sys/sys/disklabel.h12
-rw-r--r--sys/sys/diskmbr.h12
-rw-r--r--sys/sys/diskpc98.h12
-rw-r--r--sys/sys/diskslice.h17
-rw-r--r--sys/sys/dkbad.h6
-rw-r--r--sys/ufs/ufs/ufs_disksubr.c3
11 files changed, 38 insertions, 39 deletions
diff --git a/sys/i386/isa/diskslice_machdep.c b/sys/i386/isa/diskslice_machdep.c
index 4610e5f60ce4e..595898c11e140 100644
--- a/sys/i386/isa/diskslice_machdep.c
+++ b/sys/i386/isa/diskslice_machdep.c
@@ -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
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index 7026b9116c73e..c5ae8a83c3080 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -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>
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index 4610e5f60ce4e..595898c11e140 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -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
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 87a5f4a9b807e..64e93b8056337 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -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
diff --git a/sys/kern/subr_dkbad.c b/sys/kern/subr_dkbad.c
index 5cc2845139031..2d4957a0e5ea0 100644
--- a/sys/kern/subr_dkbad.c
+++ b/sys/kern/subr_dkbad.c
@@ -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>
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 1645096f575db..3f8e4bceb76a6 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -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 */
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 1645096f575db..3f8e4bceb76a6 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -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 */
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index 1645096f575db..3f8e4bceb76a6 100644
--- a/sys/sys/diskpc98.h
+++ b/sys/sys/diskpc98.h
@@ -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 */
diff --git a/sys/sys/diskslice.h b/sys/sys/diskslice.h
index 0d1820a17d021..92b7c67439108 100644
--- a/sys/sys/diskslice.h
+++ b/sys/sys/diskslice.h
@@ -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 */
diff --git a/sys/sys/dkbad.h b/sys/sys/dkbad.h
index 02138c6cf9683..2c87b769e1752 100644
--- a/sys/sys/dkbad.h
+++ b/sys/sys/dkbad.h
@@ -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
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index 7026b9116c73e..c5ae8a83c3080 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 22:31:26 +0000