From owner-svn-src-all@FreeBSD.ORG Mon Aug 4 23:57:47 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29D7F32F for ; Mon, 4 Aug 2014 23:57:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00C502EA6 for ; Mon, 4 Aug 2014 23:57:47 +0000 (UTC) Received: from delphij (uid 1035) (envelope-from delphij@FreeBSD.org) id 5f83 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 04 Aug 2014 23:57:46 +0000 From: Xin LI Date: Mon, 4 Aug 2014 23:57:46 +0000 (UTC) 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 X-SVN-Group: vendor-sys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e01dfa.5f83.14a4a95b@svn.freebsd.org> X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Aug 2014 23:57:47 -0000 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 Reviewed by: Mattew Ahrens Reviewed by: Paul Dagnelie Reviewed by: Dan Kimmel Reviewed by: Saso Kiselkov Approved by: Rich Lowe Author: Alex Reece 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