From owner-svn-src-all@FreeBSD.ORG Mon Oct 6 06:00:51 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62DAFB39; Mon, 6 Oct 2014 06:00:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4EF18166; Mon, 6 Oct 2014 06:00:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9660plZ068710; Mon, 6 Oct 2014 06:00:51 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9660pJr068709; Mon, 6 Oct 2014 06:00:51 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201410060600.s9660pJr068709@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 6 Oct 2014 06:00:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r272588 - vendor/illumos/dist/cmd/zdb X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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, 06 Oct 2014 06:00:51 -0000 Author: delphij Date: Mon Oct 6 06:00:50 2014 New Revision: 272588 URL: https://svnweb.freebsd.org/changeset/base/272588 Log: 5178 zdb -vvvvv on old-format pool fails in dump_deadlist() Reviewed by: Christopher Siden Reviewed by: George Wilson Reviewed by: Richard Lowe Reviewed by: Saso Kiselkov Reviewed by: Richard Elling Reviewed by: Alek Pinchuk Approved by: Garrett D'Amore Author: Matthew Ahrens illumos/illumos-gate@90c76c66a2e21307c5370ae1bd3c7145a60c874f Modified: vendor/illumos/dist/cmd/zdb/zdb.c Modified: vendor/illumos/dist/cmd/zdb/zdb.c ============================================================================== --- vendor/illumos/dist/cmd/zdb/zdb.c Mon Oct 6 06:00:06 2014 (r272587) +++ vendor/illumos/dist/cmd/zdb/zdb.c Mon Oct 6 06:00:50 2014 (r272588) @@ -1434,6 +1434,11 @@ dump_deadlist(dsl_deadlist_t *dl) if (dump_opt['d'] < 3) return; + if (dl->dl_oldfmt) { + dump_bpobj(&dl->dl_bpobj, "old-format deadlist", 0); + return; + } + zdb_nicenum(dl->dl_phys->dl_used, bytes); zdb_nicenum(dl->dl_phys->dl_comp, comp); zdb_nicenum(dl->dl_phys->dl_uncomp, uncomp);