svn commit: r217411 - projects/graid/head/sys/geom/raid

[Alexander Motin]

Author: mav
Date: Fri Jan 14 18:43:14 2011
New Revision: 217411
URL: http://svn.freebsd.org/changeset/base/217411

Log:
  Remake providers naming. Assign numbers at volumes creation time, not on
  providers creation. This makes ordering more predictable.

Modified:
  projects/graid/head/sys/geom/raid/g_raid.c
  projects/graid/head/sys/geom/raid/g_raid.h

Modified: projects/graid/head/sys/geom/raid/g_raid.c
==============================================================================
--- projects/graid/head/sys/geom/raid/g_raid.c	Fri Jan 14 17:06:54 2011	(r217410)
+++ projects/graid/head/sys/geom/raid/g_raid.c	Fri Jan 14 18:43:14 2011	(r217411)
@@ -85,6 +85,9 @@ LIST_HEAD(, g_raid_md_class) g_raid_md_c
 LIST_HEAD(, g_raid_tr_class) g_raid_tr_classes =
     LIST_HEAD_INITIALIZER(g_raid_tr_classes);
 
+LIST_HEAD(, g_raid_volume) g_raid_volumes =
+    LIST_HEAD_INITIALIZER(g_raid_volumes);
+
 //static eventhandler_tag g_raid_pre_sync = NULL;
 
 static int g_raid_destroy_geom(struct gctl_req *req, struct g_class *mp,
@@ -1096,7 +1099,6 @@ g_raid_launch_provider(struct g_raid_vol
 	struct g_raid_softc *sc;
 	struct g_provider *pp;
 	char name[G_RAID_MAX_VOLUMENAME];
-	int i;
 
 	sc = vol->v_softc;
 	sx_assert(&sc->sc_lock, SX_LOCKED);
@@ -1106,12 +1108,8 @@ g_raid_launch_provider(struct g_raid_vol
 	snprintf(name, sizeof(name), "raid/%s", vol->v_name);
 	if (g_raid_name_format == 0 || vol->v_name[0] == 0 ||
 	    g_provider_by_name(name) != NULL) {
-	    /* Otherwise find first free name. */
-	    for (i = 0; ; i++) {
-		snprintf(name, sizeof(name), "raid/r%d", i);
-		if (g_provider_by_name(name) == NULL)
-			break;
-	    }
+		/* Otherwise use sequential volume number. */
+		snprintf(name, sizeof(name), "raid/r%d", vol->v_global_id);
 	}
 	pp = g_new_providerf(sc->sc_geom, "%s", name);
 	pp->private = vol;
@@ -1337,7 +1335,7 @@ g_raid_create_node(struct g_class *mp,
 struct g_raid_volume *
 g_raid_create_volume(struct g_raid_softc *sc, const char *name)
 {
-	struct g_raid_volume	*vol;
+	struct g_raid_volume	*vol, *vol1;
 	int i;
 
 	G_RAID_DEBUG(1, "Creating volume %s.", name);
@@ -1355,6 +1353,22 @@ g_raid_create_volume(struct g_raid_softc
 		vol->v_subdisks[i].sd_pos = i;
 		vol->v_subdisks[i].sd_state = G_RAID_DISK_S_NONE;
 	}
+
+	/* Find free ID for this volume. */
+	g_topology_lock();
+	for (i = 0; ; i++) {
+		LIST_FOREACH(vol1, &g_raid_volumes, v_global_next) {
+			if (vol1->v_global_id == i)
+				break;
+		}
+		if (vol1 == NULL)
+			break;
+	}
+	vol->v_global_id = i;
+	LIST_INSERT_HEAD(&g_raid_volumes, vol, v_global_next);
+	g_topology_unlock();
+
+	/* Delay root mounting. */
 	vol->v_rootmount = root_mount_hold("GRAID");
 	G_RAID_DEBUG(1, "root_mount_hold %p", vol->v_rootmount);
 	callout_init(&vol->v_start_co, 1);
@@ -1491,6 +1505,9 @@ g_raid_destroy_volume(struct g_raid_volu
 	if (vol->v_rootmount)
 		root_mount_rel(vol->v_rootmount);
 	callout_drain(&vol->v_start_co);
+	g_topology_lock();
+	LIST_REMOVE(vol, v_global_next);
+	g_topology_unlock();
 	TAILQ_REMOVE(&sc->sc_volumes, vol, v_next);
 	for (i = 0; i < G_RAID_MAX_SUBDISKS; i++) {
 		disk = vol->v_subdisks[i].sd_disk;

Modified: projects/graid/head/sys/geom/raid/g_raid.h
==============================================================================
--- projects/graid/head/sys/geom/raid/g_raid.h	Fri Jan 14 17:06:54 2011	(r217410)
+++ projects/graid/head/sys/geom/raid/g_raid.h	Fri Jan 14 18:43:14 2011	(r217411)
@@ -205,7 +205,9 @@ struct g_raid_volume {
 	int			 v_starting;	/* STARTING state timer armed */
 	int			 v_stopping;	/* Volume is stopping */
 	int			 v_provider_open; /* Number of opens. */
+	int			 v_global_id;	/* Global volume ID (rX). */
 	TAILQ_ENTRY(g_raid_volume)	 v_next; /* List of volumes entry. */
+	LIST_ENTRY(g_raid_volume)	 v_global_next; /* Global list entry. */
 };
 
 struct g_raid_softc {