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

[Alexander Motin]

Author: mav
Date: Sat Mar 19 14:44:24 2011
New Revision: 219774
URL: http://svn.freebsd.org/changeset/base/219774

Log:
  Make `graid delete` command interpret optional num argument as volume ID,
  used in `raid/rX` provider names, instead of internal position in metadata.
  It seems better to not introduce new number without a reason. This fixes
  `graid delete` for Promise.

Modified:
  projects/graid/head/sys/geom/raid/md_intel.c
  projects/graid/head/sys/geom/raid/md_promise.c

Modified: projects/graid/head/sys/geom/raid/md_intel.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_intel.c	Sat Mar 19 14:38:28 2011	(r219773)
+++ projects/graid/head/sys/geom/raid/md_intel.c	Sat Mar 19 14:44:24 2011	(r219774)
@@ -1803,7 +1803,7 @@ g_raid_md_ctl_intel(struct g_raid_md_obj
 			i = strtol(volname, &tmp, 10);
 			if (verb != volname && tmp[0] == 0) {
 				TAILQ_FOREACH(vol, &sc->sc_volumes, v_next) {
-					if ((intptr_t)vol->v_md_data == i)
+					if (vol->v_global_id == i)
 						break;
 				}
 			}

Modified: projects/graid/head/sys/geom/raid/md_promise.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_promise.c	Sat Mar 19 14:38:28 2011	(r219773)
+++ projects/graid/head/sys/geom/raid/md_promise.c	Sat Mar 19 14:44:24 2011	(r219774)
@@ -1570,7 +1570,7 @@ g_raid_md_ctl_promise(struct g_raid_md_o
 			i = strtol(volname, &tmp, 10);
 			if (verb != volname && tmp[0] == 0) {
 				TAILQ_FOREACH(vol, &sc->sc_volumes, v_next) {
-					if ((intptr_t)vol->v_md_data == i)
+					if (vol->v_global_id == i)
 						break;
 				}
 			}