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/isa/fd.c | |
| 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/isa/fd.c')
| -rw-r--r-- | sys/isa/fd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 43b0274..c86bc86 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.150 1999/07/29 01:02:55 mdodd Exp $ + * $Id: fd.c,v 1.151 1999/07/29 11:27:33 joerg Exp $ * */ @@ -2217,7 +2217,7 @@ fdformat(dev, finfo, p) /* now do the format */ bp->b_dev = dev; - fdstrategy(bp); + BUF_STRATEGY(bp, 0); /* ...and wait for it to complete */ s = splbio(); @@ -2277,7 +2277,7 @@ fdioctl(dev, cmd, addr, flag, p) dl->d_secpercyl = fdt->size / fdt->tracks; dl->d_type = DTYPE_FLOPPY; - if (readdisklabel(dkmodpart(dev, RAW_PART), fdstrategy, dl) + if (readdisklabel(dkmodpart(dev, RAW_PART), dl) == NULL) error = 0; else @@ -2308,8 +2308,7 @@ fdioctl(dev, cmd, addr, flag, p) (u_long)0)) != 0) break; - error = writedisklabel(dev, fdstrategy, - (struct disklabel *)buffer); + error = writedisklabel(dev, (struct disklabel *)buffer); break; case FD_FORM: if ((flag & FWRITE) == 0) |
