svn commit: r270128 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Mon Aug 18 05:22:09 2014
New Revision: 270128
URL: http://svnweb.freebsd.org/changeset/base/270128

Log:
  MFC r269543: MFV r269542:
  
  In vdev_get_stats, check that the vdev is not a hole before computing the
  fragmentation.  This fixes a panic when removing log device.
  
  Illumos issue:
      5049 panic when removing log device

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

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c	Mon Aug 18 05:17:24 2014	(r270127)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c	Mon Aug 18 05:22:09 2014	(r270128)
@@ -2766,8 +2766,9 @@ vdev_get_stats(vdev_t *vd, vdev_stat_t *
 	    ? vd->vdev_top->vdev_ashift : vd->vdev_ashift;
 	vs->vs_logical_ashift = vd->vdev_logical_ashift;
 	vs->vs_physical_ashift = vd->vdev_physical_ashift;
-	if (vd->vdev_aux == NULL && vd == vd->vdev_top)
+	if (vd->vdev_aux == NULL && vd == vd->vdev_top && !vd->vdev_ishole) {
 		vs->vs_fragmentation = vd->vdev_mg->mg_fragmentation;
+	}
 
 	/*
 	 * If we're getting stats on the root vdev, aggregate the I/O counts