From owner-svn-src-projects@FreeBSD.ORG  Sat Mar 19 14:44:25 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C3DAD106567B;
	Sat, 19 Mar 2011 14:44:24 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9A5F98FC1F;
	Sat, 19 Mar 2011 14:44:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2JEiOud026056;
	Sat, 19 Mar 2011 14:44:24 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2JEiO92026053;
	Sat, 19 Mar 2011 14:44:24 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201103191444.p2JEiO92026053@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 19 Mar 2011 14:44:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219774 - projects/graid/head/sys/geom/raid
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Mar 2011 14:44:25 -0000

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;
 				}
 			}