Author: delphij
Date: Mon Aug 4 23:57:46 2014
New Revision: 269542
URL: http://svnweb.freebsd.org/changeset/base/269542
Log:
5049 panic when removing log device
Reviewed by: George Wilson <george.wil...@delphix.com>
Reviewed by: Mattew Ahrens <mahr...@delphix.com>
Reviewed by: Paul Dagnelie <paul.dagne...@delphix.com>
Reviewed by: Dan Kimmel <dan.kim...@delphix.com>
Reviewed by: Saso Kiselkov <skisel...@gmail.com>
Approved by: Rich Lowe <richl...@richlowe.net>
Author: Alex Reece <a...@delphix.com>
illumos/illumos-gate@2986efa8094ce00f75df27fb74a184c65c38614a
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c Mon Aug 4 23:00:13
2014 (r269541)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c Mon Aug 4 23:57:46
2014 (r269542)
@@ -2613,8 +2613,9 @@ vdev_get_stats(vdev_t *vd, vdev_stat_t *
if (vd->vdev_ops->vdev_op_leaf)
vs->vs_rsize += VDEV_LABEL_START_SIZE + VDEV_LABEL_END_SIZE;
vs->vs_esize = vd->vdev_max_asize - vd->vdev_asize;
- 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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
