svn commit: r286602 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor-sys/illumos/dist/uts/common/fs/zfs/sys vendor/illumos/dist/cmd/zdb

[Alexander Motin]

Author: mav
Date: Mon Aug 10 21:32:07 2015
New Revision: 286602
URL: https://svnweb.freebsd.org/changeset/base/286602

Log:
  5810 zdb should print details of bpobj
  
  Reviewed by: Prakash Surya <prakash.surya at delphix.com>
  Reviewed by: Alex Reece <alex at delphix.com>
  Reviewed by: George Wilson <george at delphix.com>
  Reviewed by: Will Andrews <will at freebsd.org>
  Reviewed by: Simon Klinkert <simon.klinkert at gmail.com>
  Approved by: Gordon Ross <gwr at nexenta.com>
  Author: Matthew Ahrens <mahrens at delphix.com>
  
  illumos/illumos-gate at 732885fca09e11183dd0ea69aaaab5588fb7dbff

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/bpobj.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/bpobj.h

Changes in other areas also in this revision:
Modified:
  vendor/illumos/dist/cmd/zdb/zdb.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/bpobj.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/bpobj.c	Mon Aug 10 21:31:50 2015	(r286601)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/bpobj.c	Mon Aug 10 21:32:07 2015	(r286602)
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/bpobj.h>
@@ -256,9 +256,8 @@ bpobj_iterate_impl(bpobj_t *bpo, bpobj_i
 		dbuf = NULL;
 	}
 	if (free) {
-		i++;
 		VERIFY3U(0, ==, dmu_free_range(bpo->bpo_os, bpo->bpo_object,
-		    i * sizeof (blkptr_t), -1ULL, tx));
+		    (i + 1) * sizeof (blkptr_t), -1ULL, tx));
 	}
 	if (err || !bpo->bpo_havesubobj || bpo->bpo_phys->bpo_subobjs == 0)
 		goto out;

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/sys/bpobj.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/sys/bpobj.h	Mon Aug 10 21:31:50 2015	(r286601)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/sys/bpobj.h	Mon Aug 10 21:32:07 2015	(r286602)
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef	_SYS_BPOBJ_H
@@ -77,7 +77,6 @@ void bpobj_close(bpobj_t *bpo);
 
 int bpobj_iterate(bpobj_t *bpo, bpobj_itor_t func, void *arg, dmu_tx_t *tx);
 int bpobj_iterate_nofree(bpobj_t *bpo, bpobj_itor_t func, void *, dmu_tx_t *);
-int bpobj_iterate_dbg(bpobj_t *bpo, uint64_t *itorp, blkptr_t *bp);
 
 void bpobj_enqueue_subobj(bpobj_t *bpo, uint64_t subobj, dmu_tx_t *tx);
 void bpobj_enqueue(bpobj_t *bpo, const blkptr_t *bp, dmu_tx_t *tx);