From owner-svn-src-stable@FreeBSD.ORG  Sat Feb  2 11:30:53 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id D79B4AB6;
 Sat,  2 Feb 2013 11:30:53 +0000 (UTC) (envelope-from avg@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 C937BB3C;
 Sat,  2 Feb 2013 11:30:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r12BUr9V022991;
 Sat, 2 Feb 2013 11:30:53 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r12BUrup022990;
 Sat, 2 Feb 2013 11:30:53 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201302021130.r12BUrup022990@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 2 Feb 2013 11:30:53 +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: r246241 - stable/9/sys/geom/mirror
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: Sat, 02 Feb 2013 11:30:53 -0000

Author: avg
Date: Sat Feb  2 11:30:53 2013
New Revision: 246241
URL: http://svnweb.freebsd.org/changeset/base/246241

Log:
  MFC r245946: g_mirror: g_getattr() failure should not be fatal
  
  PR:		kern/175323

Modified:
  stable/9/sys/geom/mirror/g_mirror.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/geom/mirror/g_mirror.c
==============================================================================
--- stable/9/sys/geom/mirror/g_mirror.c	Sat Feb  2 11:25:10 2013	(r246240)
+++ stable/9/sys/geom/mirror/g_mirror.c	Sat Feb  2 11:30:53 2013	(r246241)
@@ -456,9 +456,7 @@ g_mirror_init_disk(struct g_mirror_softc
 	disk->d_priority = md->md_priority;
 	disk->d_flags = md->md_dflags;
 	error = g_getattr("GEOM::candelete", disk->d_consumer, &i);
-	if (error != 0)
-		goto fail;
-	if (i)
+	if (error == 0 && i != 0)
 		disk->d_flags |= G_MIRROR_DISK_FLAG_CANDELETE;
 	if (md->md_provider[0] != '\0')
 		disk->d_flags |= G_MIRROR_DISK_FLAG_HARDCODED;