diff options
Diffstat (limited to 'sys/dev/vinum')
| -rw-r--r-- | sys/dev/vinum/vinum.c | 3 | ||||
| -rw-r--r-- | sys/dev/vinum/vinumext.h | 4 | ||||
| -rw-r--r-- | sys/dev/vinum/vinumio.c | 4 | ||||
| -rw-r--r-- | sys/dev/vinum/vinumrequest.c | 6 |
4 files changed, 7 insertions, 10 deletions
diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c index 8d30d5a..810c67d 100644 --- a/sys/dev/vinum/vinum.c +++ b/sys/dev/vinum/vinum.c @@ -33,7 +33,7 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinum.c,v 1.24 1999/03/19 05:35:25 grog Exp grog $ + * $Id: vinum.c,v 1.21 1999/05/07 08:07:08 grog Exp $ */ #define STATIC static /* nothing while we're testing XXX */ @@ -237,7 +237,6 @@ vinum_modevent(module_t mod, modeventtype_t type, void *unused) } #endif cdevsw[CDEV_MAJOR] = NULL; /* no cdevsw any more */ - bdevsw[BDEV_MAJOR] = NULL; /* nor bdevsw */ log(LOG_INFO, "vinum: unloaded\n"); /* tell the world */ return 0; default: diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h index fc3f1eb..071afdf 100644 --- a/sys/dev/vinum/vinumext.h +++ b/sys/dev/vinum/vinumext.h @@ -33,7 +33,7 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumext.h,v 1.19 1999/03/23 02:57:04 grog Exp grog $ + * $Id: vinumext.h,v 1.15 1999/05/07 08:07:09 grog Exp $ */ /* vinumext.h: external definitions */ @@ -132,8 +132,6 @@ d_strategy_t vinumstrategy; d_ioctl_t vinumioctl; d_dump_t vinumdump; d_psize_t vinumsize; -d_read_t physread; -d_write_t physwrite; int vinumstart(struct buf *bp, int reviveok); int launch_requests(struct request *rq, int reviveok); diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c index 991a8be..2651205 100644 --- a/sys/dev/vinum/vinumio.c +++ b/sys/dev/vinum/vinumio.c @@ -33,7 +33,7 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumio.c,v 1.24 1999/03/23 02:00:52 grog Exp grog $ + * $Id: vinumio.c,v 1.23 1999/05/07 01:32:09 grog Exp $ */ #include <dev/vinum/vinumhdr.h> @@ -285,7 +285,7 @@ driveio(struct drive *drive, char *buf, size_t length, off_t offset, int flag) bp->b_bcount = len; bp->b_bufsize = len; - (*bdevsw[major(bp->b_dev)]->d_strategy) (bp); /* initiate the transfer */ + (*bdevsw(major(bp->b_dev))->d_strategy) (bp); /* initiate the transfer */ error = biowait(bp); printf("driveio: %s dev 0x%x, block 0x%x, len 0x%lx, error %d\n", /* XXX */ diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c index f286dc7..477ec40 100644 --- a/sys/dev/vinum/vinumrequest.c +++ b/sys/dev/vinum/vinumrequest.c @@ -33,7 +33,7 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumrequest.c,v 1.23 1999/03/20 21:58:38 grog Exp grog $ + * $Id: vinumrequest.c,v 1.21 1999/05/07 08:07:09 grog Exp $ */ #include <dev/vinum/vinumhdr.h> @@ -390,7 +390,7 @@ launch_requests(struct request *rq, int reviveok) logrq(loginfo_rqe, (union rqinfou) rqe, rq->bp); #endif /* fire off the request */ - (*bdevsw[major(rqe->b.b_dev)]->d_strategy) (&rqe->b); + (*bdevsw(major(rqe->b.b_dev))->d_strategy) (&rqe->b); } /* XXX Do we need caching? Think about this more */ } @@ -865,7 +865,7 @@ sdio(struct buf *bp) sbp->b.b_vp->v_numoutput); #endif s = splbio(); - (*bdevsw[major(sbp->b.b_dev)]->d_strategy) (&sbp->b); + (*bdevsw(major(sbp->b.b_dev))->d_strategy) (&sbp->b); splx(s); } |
