diff options
| author | phk <phk@FreeBSD.org> | 1999-08-14 11:40:51 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-08-14 11:40:51 +0000 |
| commit | 5f45261e990bb420f6394e615c3495668886dfe9 (patch) | |
| tree | 66dfc8aa5c9515f4ec0197d4ad3f1c2445413016 /sys/dev/vn | |
| parent | 5ff2615ae3524707b482556fcc6668d139f2cd67 (diff) | |
| download | FreeBSD-src-5f45261e990bb420f6394e615c3495668886dfe9.zip FreeBSD-src-5f45261e990bb420f6394e615c3495668886dfe9.tar.gz | |
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.
Diffstat (limited to 'sys/dev/vn')
| -rw-r--r-- | sys/dev/vn/vn.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c index b45985e..382d4b1 100644 --- a/sys/dev/vn/vn.c +++ b/sys/dev/vn/vn.c @@ -38,7 +38,7 @@ * from: Utah Hdr: vn.c 1.13 94/04/02 * * from: @(#)vn.c 8.6 (Berkeley) 4/1/94 - * $Id: vn.c,v 1.82 1999/08/08 18:42:42 phk Exp $ + * $Id: vn.c,v 1.83 1999/08/08 22:01:50 phk Exp $ */ /* @@ -210,8 +210,7 @@ vnopen(dev_t dev, int flags, int mode, struct proc *p) label.d_partitions[RAW_PART].p_size = vn->sc_size; return (dsopen("vn", dev, mode, 0, &vn->sc_slices, - &label, vnstrategy, (ds_setgeom_t *)NULL, - &vn_cdevsw)); + &label)); } if (dkslice(dev) != WHOLE_DISK_SLICE || dkpart(dev) != RAW_PART || @@ -362,8 +361,7 @@ vnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) IFOPT(vn,VN_LABELS) { if (vn->sc_slices != NULL) { error = dsioctl("vn", dev, cmd, data, flag, - &vn->sc_slices, vnstrategy, - (ds_setgeom_t *)NULL); + &vn->sc_slices); if (error != ENOIOCTL) return (error); } |
