From 5f45261e990bb420f6394e615c3495668886dfe9 Mon Sep 17 00:00:00 2001 From: phk Date: Sat, 14 Aug 1999 11:40:51 +0000 Subject: Spring cleaning around strategy and disklabels/slices: Introduce BUF_STRATEGY(struct buf *, int flag) macro, and use it throughout. please see comment in sys/conf.h about the flag argument. Remove strategy argument from all the diskslice/label/bad144 implementations, it should be found from the dev_t. Remove bogus and unused strategy1 routines. Remove open/close arguments from dssize(). Pick them up from dev_t. Remove unused and unfinished setgeom support from diskslice/label/bad144 code. --- sys/dev/ida/ida_disk.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'sys/dev/ida') diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c index ed52ae2..4564916 100644 --- a/sys/dev/ida/ida_disk.c +++ b/sys/dev/ida/ida_disk.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ida_disk.c,v 1.1 1999/06/24 03:31:57 jlemon Exp $ + * $Id: ida_disk.c,v 1.2 1999/07/04 14:58:16 phk Exp $ */ /* @@ -144,8 +144,7 @@ idopen(dev_t dev, int flags, int fmt, struct proc *p) label.d_secperunit = drv->secperunit; /* Initialize slice tables. */ - error = dsopen("id", dev, fmt, 0, &drv->slices, &label, - idstrategy, (ds_setgeom_t *)NULL, &id_cdevsw); + error = dsopen("id", dev, fmt, 0, &drv->slices, &label); return (error); } @@ -172,8 +171,7 @@ idioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p) if (drv == NULL) return (ENXIO); - error = dsioctl("id", dev, cmd, addr, flag, &drv->slices, - idstrategy, (ds_setgeom_t *)NULL); + error = dsioctl("id", dev, cmd, addr, flag, &drv->slices); if (error == ENOIOCTL) return (ENOTTY); @@ -189,7 +187,7 @@ idsize(dev_t dev) drv = idgetsoftc(dev); if (drv == NULL) return (ENXIO); - return (dssize(dev, &drv->slices, idopen, idclose)); + return (dssize(dev, &drv->slices)); } /* -- cgit v1.1