From owner-svn-src-stable@FreeBSD.ORG  Mon Dec  3 18:12:55 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 8D8C745E;
 Mon,  3 Dec 2012 18:12:55 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5662D8FC12;
 Mon,  3 Dec 2012 18:12:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB3ICt1U098986;
 Mon, 3 Dec 2012 18:12:55 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB3ICtLV098985;
 Mon, 3 Dec 2012 18:12:55 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201212031812.qB3ICtLV098985@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 3 Dec 2012 18:12:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243813 -
 stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Dec 2012 18:12:55 -0000

Author: delphij
Date: Mon Dec  3 18:12:54 2012
New Revision: 243813
URL: http://svnweb.freebsd.org/changeset/base/243813

Log:
  MFC r242332:
  
  s/dettach/detach/g
  
  Approved by:	pjd

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Mon Dec  3 18:10:30 2012	(r243812)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Mon Dec  3 18:12:54 2012	(r243813)
@@ -329,7 +329,7 @@ vdev_geom_attach_taster(struct g_consume
 }
 
 static void
-vdev_geom_dettach_taster(struct g_consumer *cp)
+vdev_geom_detach_taster(struct g_consumer *cp)
 {
 	g_access(cp, -1, 0, 0);
 	g_detach(cp);
@@ -370,7 +370,7 @@ vdev_geom_read_pool_label(const char *na
 				g_topology_unlock();
 				error = vdev_geom_read_config(zcp, &vdev_cfg);
 				g_topology_lock();
-				vdev_geom_dettach_taster(zcp);
+				vdev_geom_detach_taster(zcp);
 				if (error)
 					continue;
 				ZFS_LOG(1, "successfully read vdev config");
@@ -439,7 +439,7 @@ vdev_geom_attach_by_guid(uint64_t guid)
 				g_topology_unlock();
 				pguid = vdev_geom_read_guid(zcp);
 				g_topology_lock();
-				vdev_geom_dettach_taster(zcp);
+				vdev_geom_detach_taster(zcp);
 				if (pguid != guid)
 					continue;
 				cp = vdev_geom_attach(pp);