From 201dfcf143b143e316e00834c7fe4469e6ac9962 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek <pjd@FreeBSD.org> Date: Mon, 20 Sep 2004 17:26:25 +0000 Subject: [PATCH] This is not needed anymore, it is forced in GEOM now. Actually, it can even cause some problems, because GEOM requires sectorsize to be more than 0 on first access, not on provider creation, so we can skip valid providers by doing this check here. Reported by: Divacky Roman <xdivac02@stud.fit.vutbr.cz> Sven Willenberger <sven@dmv.com> --- sys/geom/concat/g_concat.c | 3 --- sys/geom/label/g_label.c | 3 --- sys/geom/mirror/g_mirror.c | 3 --- sys/geom/raid3/g_raid3.c | 3 --- sys/geom/stripe/g_stripe.c | 3 --- 5 files changed, 15 deletions(-) diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c index d8798a47036e..a1e1765485e9 100644 --- a/sys/geom/concat/g_concat.c +++ b/sys/geom/concat/g_concat.c @@ -546,9 +546,6 @@ g_concat_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) 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; diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c index 92c95335739d..e224c433d9ab 100644 --- a/sys/geom/label/g_label.c +++ b/sys/geom/label/g_label.c @@ -202,9 +202,6 @@ g_label_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) 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); diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c index c71b36e9b113..2f17964aea46 100644 --- a/sys/geom/mirror/g_mirror.c +++ b/sys/geom/mirror/g_mirror.c @@ -2491,9 +2491,6 @@ g_mirror_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) g_topology_assert(); g_trace(G_T_TOPOLOGY, "%s(%s, %s)", __func__, mp->name, pp->name); G_MIRROR_DEBUG(2, "Tasting %s.", pp->name); - /* Skip providers with 0 sectorsize. */ - if (pp->sectorsize == 0) - return (NULL); gp = g_new_geomf(mp, "mirror:taste"); /* diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 2806080e9e87..23e5d7ea635e 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -2704,9 +2704,6 @@ g_raid3_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) g_topology_assert(); g_trace(G_T_TOPOLOGY, "%s(%s, %s)", __func__, mp->name, pp->name); G_RAID3_DEBUG(2, "Tasting %s.", pp->name); - /* Skip providers with 0 sectorsize. */ - if (pp->sectorsize == 0) - return (NULL); gp = g_new_geomf(mp, "raid3:taste"); /* This orphan function should be never called. */ diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c index 7401c06c976f..647316ba2817 100644 --- a/sys/geom/stripe/g_stripe.c +++ b/sys/geom/stripe/g_stripe.c @@ -877,9 +877,6 @@ g_stripe_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) 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;