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/geom | |
| 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/geom')
| -rw-r--r-- | sys/geom/geom_ccd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c index 1ebdce2..c6eb299 100644 --- a/sys/geom/geom_ccd.c +++ b/sys/geom/geom_ccd.c @@ -1,4 +1,4 @@ -/* $Id: ccd.c,v 1.50 1999/07/17 19:58:37 phk Exp $ */ +/* $Id: ccd.c,v 1.51 1999/07/18 14:30:57 phk Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ @@ -1265,7 +1265,7 @@ ccdioctl(dev, cmd, data, flag, p) if (error == 0) { if (cmd == DIOCWDINFO) error = writedisklabel(CCDLABELDEV(dev), - ccdstrategy, &cs->sc_label); + &cs->sc_label); } cs->sc_flags &= ~CCDF_LABELLING; @@ -1435,8 +1435,8 @@ ccdgetdisklabel(dev) /* * Call the generic disklabel extraction routine. */ - if ((errstring = readdisklabel(CCDLABELDEV(dev), ccdstrategy, - &cs->sc_label)) != NULL) + errstring = readdisklabel(CCDLABELDEV(dev), &cs->sc_label); + if (errstring != NULL) ccdmakedisklabel(cs); #ifdef DEBUG |
