svn commit: r245946 - head/sys/geom/mirror

[Andriy Gapon]

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 at softlynx.ru, mav
  Reported by:	Alexei.Volkov at softlynx.ru
  Tested by:	Alexei.Volkov at 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;