From 49ff4debd3d4c155448b2b4e3b95b17d9eb575ed Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp 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/ccd/ccd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/dev/ccd') diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index 1ebdce2359735..c6eb299612e80 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/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 -- cgit v1.3