svn commit: r221101 - in head/sys/geom: . concat journal mirror
raid3 shsec stripe virstor
Alexander Motin
mav at FreeBSD.org
Wed Apr 27 00:10:27 UTC 2011
Author: mav
Date: Wed Apr 27 00:10:26 2011
New Revision: 221101
URL: http://svn.freebsd.org/changeset/base/221101
Log:
Implement relaxed comparision for hardcoded provider names to make it
ignore adX/adaY difference in both directions to simplify migration to
the CAM-based ATA or back.
Modified:
head/sys/geom/concat/g_concat.c
head/sys/geom/geom.h
head/sys/geom/geom_subr.c
head/sys/geom/journal/g_journal.c
head/sys/geom/mirror/g_mirror.c
head/sys/geom/raid3/g_raid3.c
head/sys/geom/shsec/g_shsec.c
head/sys/geom/stripe/g_stripe.c
head/sys/geom/virstor/g_virstor.c
Modified: head/sys/geom/concat/g_concat.c
==============================================================================
--- head/sys/geom/concat/g_concat.c Tue Apr 26 23:00:32 2011 (r221100)
+++ head/sys/geom/concat/g_concat.c Wed Apr 27 00:10:26 2011 (r221101)
@@ -678,7 +678,8 @@ g_concat_taste(struct g_class *mp, struc
if (md.md_version < 4)
md.md_provsize = pp->mediasize;
- if (md.md_provider[0] != '\0' && strcmp(md.md_provider, pp->name) != 0)
+ if (md.md_provider[0] != '\0' &&
+ !g_compare_names(md.md_provider, pp->name))
return (NULL);
if (md.md_provsize != pp->mediasize)
return (NULL);
Modified: head/sys/geom/geom.h
==============================================================================
--- head/sys/geom/geom.h Tue Apr 26 23:00:32 2011 (r221100)
+++ head/sys/geom/geom.h Wed Apr 27 00:10:26 2011 (r221101)
@@ -238,6 +238,7 @@ void g_waitidlelock(void);
/* geom_subr.c */
int g_access(struct g_consumer *cp, int nread, int nwrite, int nexcl);
int g_attach(struct g_consumer *cp, struct g_provider *pp);
+int g_compare_names(const char *namea, const char *nameb);
void g_destroy_consumer(struct g_consumer *cp);
void g_destroy_geom(struct g_geom *pp);
void g_destroy_provider(struct g_provider *pp);
Modified: head/sys/geom/geom_subr.c
==============================================================================
--- head/sys/geom/geom_subr.c Tue Apr 26 23:00:32 2011 (r221100)
+++ head/sys/geom/geom_subr.c Wed Apr 27 00:10:26 2011 (r221101)
@@ -1017,6 +1017,43 @@ g_getattr__(const char *attr, struct g_c
return (0);
}
+static int
+g_get_device_prefix_len(const char *name)
+{
+ int len;
+
+ if (strncmp(name, "ada", 3) == 0)
+ len = 3;
+ else if (strncmp(name, "ad", 2) == 0)
+ len = 2;
+ else
+ return (0);
+ if (name[len] < '0' || name[len] > '9')
+ return (0);
+ do {
+ len++;
+ } while (name[len] >= '0' && name[len] <= '9');
+ return (len);
+}
+
+int
+g_compare_names(const char *namea, const char *nameb)
+{
+ int deva, devb;
+
+ if (strcmp(namea, nameb) == 0)
+ return (1);
+ deva = g_get_device_prefix_len(namea);
+ if (deva == 0)
+ return (0);
+ devb = g_get_device_prefix_len(nameb);
+ if (devb == 0)
+ return (0);
+ if (strcmp(namea + deva, nameb + devb) == 0)
+ return (1);
+ return (0);
+}
+
#if defined(DIAGNOSTIC) || defined(DDB)
/*
* This function walks the mesh and returns a non-zero integer if it
Modified: head/sys/geom/journal/g_journal.c
==============================================================================
--- head/sys/geom/journal/g_journal.c Tue Apr 26 23:00:32 2011 (r221100)
+++ head/sys/geom/journal/g_journal.c Wed Apr 27 00:10:26 2011 (r221101)
@@ -2527,7 +2527,8 @@ g_journal_taste(struct g_class *mp, stru
return (NULL);
gp = NULL;
- if (md.md_provider[0] != '\0' && strcmp(md.md_provider, pp->name) != 0)
+ if (md.md_provider[0] != '\0' &&
+ !g_compare_names(md.md_provider, pp->name))
return (NULL);
if (md.md_provsize != 0 && md.md_provsize != pp->mediasize)
return (NULL);
Modified: head/sys/geom/mirror/g_mirror.c
==============================================================================
--- head/sys/geom/mirror/g_mirror.c Tue Apr 26 23:00:32 2011 (r221100)
+++ head/sys/geom/mirror/g_mirror.c Wed Apr 27 00:10:26 2011 (r221101)
@@ -3007,7 +3007,8 @@ g_mirror_taste(struct g_class *mp, struc
return (NULL);
gp = NULL;
- if (md.md_provider[0] != '\0' && strcmp(md.md_provider, pp->name) != 0)
+ if (md.md_provider[0] != '\0' &&
+ !g_compare_names(md.md_provider, pp->name))
return (NULL);
if (md.md_provsize != 0 && md.md_provsize != pp->mediasize)
return (NULL);
Modified: head/sys/geom/raid3/g_raid3.c
==============================================================================
--- head/sys/geom/raid3/g_raid3.c Tue Apr 26 23:00:32 2011 (r221100)
+++ head/sys/geom/raid3/g_raid3.c Wed Apr 27 00:10:26 2011 (r221101)
@@ -3329,7 +3329,8 @@ g_raid3_taste(struct g_class *mp, struct
return (NULL);
gp = NULL;
- if (md.md_provider[0] != '\0' && strcmp(md.md_provider, pp->name) != 0)
+ if (md.md_provider[0] != '\0' &&
+ !g_compare_names(md.md_provider, pp->name))
return (NULL);
if (md.md_provsize != 0 && md.md_provsize != pp->mediasize)
return (NULL);
Modified: head/sys/geom/shsec/g_shsec.c
==============================================================================
--- head/sys/geom/shsec/g_shsec.c Tue Apr 26 23:00:32 2011 (r221100)
+++ head/sys/geom/shsec/g_shsec.c Wed Apr 27 00:10:26 2011 (r221101)
@@ -673,7 +673,8 @@ g_shsec_taste(struct g_class *mp, struct
if (md.md_version < 1)
md.md_provsize = pp->mediasize;
- if (md.md_provider[0] != '\0' && strcmp(md.md_provider, pp->name) != 0)
+ if (md.md_provider[0] != '\0' &&
+ !g_compare_names(md.md_provider, pp->name))
return (NULL);
if (md.md_provsize != pp->mediasize)
return (NULL);
Modified: head/sys/geom/stripe/g_stripe.c
==============================================================================
--- head/sys/geom/stripe/g_stripe.c Tue Apr 26 23:00:32 2011 (r221100)
+++ head/sys/geom/stripe/g_stripe.c Wed Apr 27 00:10:26 2011 (r221101)
@@ -952,7 +952,8 @@ g_stripe_taste(struct g_class *mp, struc
if (md.md_version < 3)
md.md_provsize = pp->mediasize;
- if (md.md_provider[0] != '\0' && strcmp(md.md_provider, pp->name) != 0)
+ if (md.md_provider[0] != '\0' &&
+ !g_compare_names(md.md_provider, pp->name))
return (NULL);
if (md.md_provsize != pp->mediasize)
return (NULL);
Modified: head/sys/geom/virstor/g_virstor.c
==============================================================================
--- head/sys/geom/virstor/g_virstor.c Tue Apr 26 23:00:32 2011 (r221100)
+++ head/sys/geom/virstor/g_virstor.c Wed Apr 27 00:10:26 2011 (r221101)
@@ -809,10 +809,9 @@ g_virstor_taste(struct g_class *mp, stru
/* If the provider name is hardcoded, use the offered provider only
* if it's been offered with its proper name (the one used in
* the label command). */
- if (md.provider[0] != '\0') {
- if (strcmp(md.provider, pp->name) != 0)
- return (NULL);
- }
+ if (md.provider[0] != '\0' &&
+ !g_compare_names(md.provider, pp->name))
+ return (NULL);
/* Iterate all geoms this class already knows about to see if a new
* geom instance of this class needs to be created (in case the provider
More information about the svn-src-head
mailing list