No need for tape fields to be daddr_t. int will do.

ok beck@ deraadt@

2 files changed, 21 insertions, 22 deletions

diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 13dc8af6aa7..a772f117b55 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: st.c,v 1.73 2007/04/10 17:47:56 miod Exp $	*/
+/*	$OpenBSD: st.c,v 1.74 2007/06/01 18:44:48 krw Exp $	*/
 /*	$NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $	*/
 
 /*
@@ -204,8 +204,8 @@ struct st_softc {
 	u_int64_t numblks;		/* nominal blocks capacity            */
 	u_int32_t media_blksize;	/* 0 if not ST_FIXEDBLOCKS            */
 	u_int32_t media_density;	/* this is what it said when asked    */
-	daddr_t media_fileno;		/* relative to BOT. -1 means unknown. */
-	daddr_t media_blkno;		/* relative to BOF. -1 means unknown. */
+	int media_fileno;		/* relative to BOT. -1 means unknown. */
+	int media_blkno;		/* relative to BOF. -1 means unknown. */
 /*--------------------quirks for the whole drive------------------------------*/
 	u_int drive_quirks;	/* quirks of this drive               */
 /*--------------------How we should set up when opening each minor device----*/
@@ -234,14 +234,14 @@ int	st_read(struct st_softc *, char *, int, int);
 int	st_read_block_limits(struct st_softc *, int);
 int	st_mode_sense(struct st_softc *, int);
 int	st_mode_select(struct st_softc *, int);
-int	st_space(struct st_softc *, daddr_t, u_int, int);
-int	st_write_filemarks(struct st_softc *, daddr_t, int);
+int	st_space(struct st_softc *, int, u_int, int);
+int	st_write_filemarks(struct st_softc *, int, int);
 int	st_check_eod(struct st_softc *, int, int *, int);
 int	st_load(struct st_softc *, u_int, int);
 int	st_rewind(struct st_softc *, u_int, int);
 int	st_interpret_sense(struct scsi_xfer *);
 int	st_touch_tape(struct st_softc *);
-int	st_erase(struct st_softc *, daddr_t, int);
+int	st_erase(struct st_softc *, int, int);
 
 struct cfattach st_ca = {
 	sizeof(struct st_softc), stmatch, stattach
@@ -1057,7 +1057,7 @@ stioctl(dev, cmd, arg, flag, p)
 	int hold_blksize;
 	u_int8_t hold_density;
 	struct mtop *mt = (struct mtop *) arg;
-	daddr_t number;
+	int number;
 
 	/*
 	 * Find the device that the user is talking about
@@ -1502,8 +1502,7 @@ st_mode_select(st, flags)
 int
 st_erase(st, full, flags)
 	struct st_softc *st;
-	daddr_t full;
-	int flags;
+	int full, flags;
 {
 	struct scsi_erase cmd;
 	int tmo;
@@ -1539,7 +1538,7 @@ st_space(st, number, what, flags)
 	struct st_softc *st;
 	u_int what;
 	int flags;
-	daddr_t number;
+	int number;
 {
 	struct scsi_space cmd;
 	int error;
@@ -1613,8 +1612,8 @@ st_space(st, number, what, flags)
 	    sizeof(cmd), 0, 0, 0, ST_SPC_TIME, NULL, flags);
 
 	if (error != 0) {
-		st->media_fileno = (daddr_t) -1;
-		st->media_blkno = (daddr_t) -1;
+		st->media_fileno = -1;
+		st->media_blkno = -1;
 	} else {
 		switch (what) {
 		case SP_BLKS:
@@ -1647,7 +1646,7 @@ int
 st_write_filemarks(st, number, flags)
 	struct st_softc *st;
 	int flags;
-	daddr_t number;
+	int number;
 {
 	struct scsi_write_filemarks cmd;
 	int error;
@@ -2036,7 +2035,7 @@ bad:			free(buf, M_TEMP);
 int
 stdump(dev, blkno, va, size)
 	dev_t dev;
-	daddr_t blkno;
+	int blkno;
 	caddr_t va;
 	size_t size;
 {
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index e2e57e97307..fa7a32bad0a 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtio.h,v 1.8 2007/01/05 00:42:47 krw Exp $	*/
+/*	$OpenBSD: mtio.h,v 1.9 2007/06/01 18:44:48 krw Exp $	*/
 /*	$NetBSD: mtio.h,v 1.14 1997/04/15 06:50:19 lukem Exp $	*/
 
 /*
@@ -42,7 +42,7 @@
 /* structure for MTIOCTOP - mag tape op command */
 struct mtop {
 	short	mt_op;		/* operations defined below */
-	daddr_t	mt_count;	/* how many of them */
+	int	mt_count;	/* how many of them */
 };
 
 /* operations */
@@ -72,12 +72,12 @@ struct mtget {
 	short	mt_erreg;	/* ``error'' register */
 /* end device-dependent registers */
 	short	mt_resid;	/* residual count */
-	daddr_t mt_fileno;	/* current file number relative to BOT. */ 
-	daddr_t mt_blkno;	/* current block number relative to BOF. */
-	daddr_t	mt_blksiz;	/* current block size */
-	daddr_t	mt_density;	/* current density code */
-	daddr_t	mt_mblksiz;	/* default block size */
-	daddr_t mt_mdensity;	/* default density code */
+	int	mt_fileno;	/* current file number relative to BOT. */ 
+	int	mt_blkno;	/* current block number relative to BOF. */
+	int	mt_blksiz;	/* current block size */
+	int	mt_density;	/* current density code */
+	int	mt_mblksiz;	/* default block size */
+	int	mt_mdensity;	/* default density code */
 };
 
 /*