MFC: There is no need to skip providers with 0 sectorsize in taste routine, it is now forced by GEOM. Actually, it can even cause some problems, because GEOM requires sectorsize to be greater than 0 on first access, not on provider creation, so we can skip valid providers by doing this check in taste method. Index: sys/geom/concat/g_concat.c =================================================================== RCS file: /private/FreeBSD/src/sys/geom/concat/g_concat.c,v retrieving revision 1.18.2.1 retrieving revision 1.22 diff -u -p -r1.18.2.1 -r1.22 --- sys/geom/concat/g_concat.c 14 Sep 2004 15:33:22 -0000 1.18.2.1 +++ sys/geom/concat/g_concat.c 20 Sep 2004 17:44:41 -0000 1.22 @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.18.2.1 2004/09/14 15:33:22 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/concat/g_concat.c,v 1.22 2004/09/20 17:44:41 pjd Exp $"); #include #include @@ -546,9 +546,6 @@ g_concat_taste(struct g_class *mp, struc g_topology_assert(); G_CONCAT_DEBUG(3, "Tasting %s.", pp->name); - /* Skip providers with 0 sectorsize. */ - if (pp->sectorsize == 0) - return (NULL); gp = g_new_geomf(mp, "concat:taste"); gp->start = g_concat_start; Index: sys/geom/label/g_label.c =================================================================== RCS file: /private/FreeBSD/src/sys/geom/label/g_label.c,v retrieving revision 1.7.2.1 retrieving revision 1.11 diff -u -p -r1.7.2.1 -r1.11 --- sys/geom/label/g_label.c 14 Sep 2004 15:34:35 -0000 1.7.2.1 +++ sys/geom/label/g_label.c 20 Sep 2004 17:44:41 -0000 1.11 @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/label/g_label.c,v 1.7.2.1 2004/09/14 15:34:35 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/label/g_label.c,v 1.11 2004/09/20 17:44:41 pjd Exp $"); #include #include @@ -202,9 +202,6 @@ g_label_taste(struct g_class *mp, struct G_LABEL_DEBUG(2, "Tasting %s.", pp->name); - /* Skip providers with 0 sectorsize. */ - if (pp->sectorsize == 0) - return (NULL); if (strcmp(pp->geom->class->name, mp->name) == 0) return (NULL); Index: sys/geom/stripe/g_stripe.c =================================================================== RCS file: /private/FreeBSD/src/sys/geom/stripe/g_stripe.c,v retrieving revision 1.16.2.1 retrieving revision 1.21 diff -u -p -r1.16.2.1 -r1.21 --- sys/geom/stripe/g_stripe.c 14 Sep 2004 15:40:23 -0000 1.16.2.1 +++ sys/geom/stripe/g_stripe.c 20 Sep 2004 17:44:41 -0000 1.21 @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/stripe/g_stripe.c,v 1.16.2.1 2004/09/14 15:40:23 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/stripe/g_stripe.c,v 1.21 2004/09/20 17:44:41 pjd Exp $"); #include #include @@ -877,9 +877,6 @@ g_stripe_taste(struct g_class *mp, struc g_topology_assert(); G_STRIPE_DEBUG(3, "Tasting %s.", pp->name); - /* Skip providers with 0 sectorsize. */ - if (pp->sectorsize == 0) - return (NULL); gp = g_new_geomf(mp, "stripe:taste"); gp->start = g_stripe_start;