[src/netbsd-1-5]: src/sys/dev/scsipi Pull up revision 1.148 (requested by fvdl):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8c8ef86cc7c7
branches:  netbsd-1-5
changeset: 491670:8c8ef86cc7c7
user:      he <he%NetBSD.org@localhost>
date:      Sun May 06 20:49:00 2001 +0000

description:
Pull up revision 1.148 (requested by fvdl):
  Compensate for the fact that after __HAVE_OLD_DISKLABEL,
  DISKMINOR(u,p) is no longer contiguous over ``p'', so ranges
  cannot be passed to vdevgone().

diffstat:

 sys/dev/scsipi/cd.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r fa63322cfa6b -r 8c8ef86cc7c7 sys/dev/scsipi/cd.c
--- a/sys/dev/scsipi/cd.c       Sun May 06 20:48:42 2001 +0000
+++ b/sys/dev/scsipi/cd.c       Sun May 06 20:49:00 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd.c,v 1.141.2.1 2001/05/01 12:27:37 he Exp $  */
+/*     $NetBSD: cd.c,v 1.141.2.2 2001/05/06 20:49:00 he Exp $  */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -218,7 +218,7 @@
 {
        struct cd_softc *cd = (struct cd_softc *) self;
        struct buf *bp;
-       int s, bmaj, cmaj, mn;
+       int s, bmaj, cmaj, i, mn;
 
        /* locate the major number */
        for (bmaj = 0; bmaj <= nblkdev; bmaj++)
@@ -245,9 +245,11 @@
        splx(s);
 
        /* Nuke the vnodes for any open instances */
-       mn = CDMINOR(self->dv_unit, 0);
-       vdevgone(bmaj, mn, mn + (MAXPARTITIONS - 1), VBLK);
-       vdevgone(cmaj, mn, mn + (MAXPARTITIONS - 1), VCHR);
+       for (i = 0; i < MAXPARTITIONS; i++) {
+               mn = CDMINOR(self->dv_unit, i);
+               vdevgone(bmaj, mn, mn, VBLK);
+               vdevgone(cmaj, mn, mn, VCHR);
+       }
 
        /* Detach from the disk list. */
        disk_detach(&cd->sc_dk);