Date: Mon, 4 Aug 2014 23:57:46 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r269542 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <53e01dfa.5f83.14a4a95b@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.wilson@delphix.com> Reviewed by: Mattew Ahrens <mahrens@delphix.com> Reviewed by: Paul Dagnelie <paul.dagnelie@delphix.com> Reviewed by: Dan Kimmel <dan.kimmel@delphix.com> Reviewed by: Saso Kiselkov <skiselkov@gmail.com> Approved by: Rich Lowe <richlowe@richlowe.net> Author: Alex Reece <alex@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e01dfa.5f83.14a4a95b>