svn commit: r325912 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Thu Nov 16 22:58:55 2017
New Revision: 325912
URL: https://svnweb.freebsd.org/changeset/base/325912

Log:
  MFC r325228: vdev_geom_close: close errored consumer even if vdev_reopening is set

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

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Thu Nov 16 22:53:36 2017	(r325911)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c	Thu Nov 16 22:58:55 2017	(r325912)
@@ -932,13 +932,18 @@ skip_open:
 static void
 vdev_geom_close(vdev_t *vd)
 {
+	struct g_consumer *cp;
 
-	if (vd->vdev_reopening)
-		return;
+	cp = vd->vdev_tsd;
 
 	DROP_GIANT();
 	g_topology_lock();
-	vdev_geom_close_locked(vd);
+
+	if (!vd->vdev_reopening ||
+	    (cp != NULL && ((cp->flags & G_CF_ORPHAN) != 0 ||
+	    (cp->provider != NULL && cp->provider->error != 0))))
+		vdev_geom_close_locked(vd);
+
 	g_topology_unlock();
 	PICKUP_GIANT();
 }