From owner-svn-src-all@FreeBSD.ORG  Sat Jan 26 10:50:04 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C4A08777;
 Sat, 26 Jan 2013 10:50:04 +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 B61509ED;
 Sat, 26 Jan 2013 10:50:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0QAo4vt064807;
 Sat, 26 Jan 2013 10:50:04 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0QAo4a6064806;
 Sat, 26 Jan 2013 10:50:04 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201301261050.r0QAo4a6064806@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 26 Jan 2013 10:50:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245946 - head/sys/geom/mirror
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Jan 2013 10:50:04 -0000

Author: avg
Date: Sat Jan 26 10:50:04 2013
New Revision: 245946
URL: http://svnweb.freebsd.org/changeset/base/245946

Log:
  g_mirror: g_getattr() failure should not be fatal
  
  This allows to use gmirror e.g. on top of ZVOLs.
  
  PR:		kern/175323
  Submitted by:	Alexei.Volkov@softlynx.ru, mav
  Reported by:	Alexei.Volkov@softlynx.ru
  Tested by:	Alexei.Volkov@softlynx.ru
  Reviewed by:	ae, mav, pjd
  MFC after:	1 week

Modified:
  head/sys/geom/mirror/g_mirror.c

Modified: head/sys/geom/mirror/g_mirror.c
==============================================================================
--- head/sys/geom/mirror/g_mirror.c	Sat Jan 26 10:34:17 2013	(r245945)
+++ head/sys/geom/mirror/g_mirror.c	Sat Jan 26 10:50:04 2013	(r245946)
@@ -457,9 +457,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;