- Skip providers with 0 sectorsize. - Make kern.geom.label.debug sysctl tunable. diff -u label/g_label.c /sys/geom/label/g_label.c --- label/g_label.c Mon Aug 9 13:14:24 2004 +++ sys/geom/label/g_label.c Mon Aug 30 20:50:05 2004 @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/label/g_label.c,v 1.7 2004/08/09 11:14:24 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/label/g_label.c,v 1.9 2004/08/30 18:50:05 pjd Exp $"); #include #include @@ -44,6 +44,7 @@ SYSCTL_DECL(_kern_geom); SYSCTL_NODE(_kern_geom, OID_AUTO, label, CTLFLAG_RW, 0, "GEOM_LABEL stuff"); u_int g_label_debug = 0; +TUNABLE_INT("kern.geom.label.debug", &g_label_debug); SYSCTL_UINT(_kern_geom_label, OID_AUTO, debug, CTLFLAG_RW, &g_label_debug, 0, "Debug level"); @@ -201,6 +202,9 @@ 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);