Author: avg
Date: Thu Nov 16 23:02:04 2017
New Revision: 325913
URL: https://svnweb.freebsd.org/changeset/base/325913
Log:
MFC r325228: vdev_geom_close: close errored consumer even if vdev_reopening
is set
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Thu Nov 16 22:58:55 2017 (r325912)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
Thu Nov 16 23:02:04 2017 (r325913)
@@ -934,13 +934,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();
}
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
