Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Oct 2011 13:56:17 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r226616 - head/cddl/contrib/opensolaris/cmd/zdb
Message-ID:  <201110211356.p9LDuHHD027211@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pjd
Date: Fri Oct 21 13:56:17 2011
New Revision: 226616
URL: http://svn.freebsd.org/changeset/base/226616

Log:
  zdb: access dp_free_bpobj only if pool version is >= SPA_VERSION_DEADLISTS
  
  Submitted by:	avg
  MFC after:	3 days

Modified:
  head/cddl/contrib/opensolaris/cmd/zdb/zdb.c

Modified: head/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Oct 21 13:54:58 2011	(r226615)
+++ head/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Oct 21 13:56:17 2011	(r226616)
@@ -2190,8 +2190,10 @@ dump_block_stats(spa_t *spa)
 	 */
 	(void) bpobj_iterate_nofree(&spa->spa_deferred_bpobj,
 	    count_block_cb, &zcb, NULL);
-	(void) bpobj_iterate_nofree(&spa->spa_dsl_pool->dp_free_bpobj,
-	    count_block_cb, &zcb, NULL);
+	if (spa_version(spa) >= SPA_VERSION_DEADLISTS) {
+		(void) bpobj_iterate_nofree(&spa->spa_dsl_pool->dp_free_bpobj,
+		    count_block_cb, &zcb, NULL);
+	}
 
 	if (dump_opt['c'] > 1)
 		flags |= TRAVERSE_PREFETCH_DATA;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110211356.p9LDuHHD027211>