From b67dde11a73a9455d641403cbbb65ec2add41b41 Mon Sep 17 00:00:00 2001
From: Will Andrews <will@freebsd.org>
Date: Sun, 26 Apr 2015 15:30:46 -0700
Subject: [PATCH] 5814 bpobj_iterate_impl(): Close a refcount leak iterating on
 a sublist. Reviewed by: Prakash Surya <prakash.surya@delphix.com> Reviewed
 by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Paul Dagnelie
 <paul.dagnelie@delphix.com> Reviewed by: Simon Klinkert
 <simon.klinkert@gmail.com> Approved by: Gordon Ross <gwr@nexenta.com>

---
 usr/src/uts/common/fs/zfs/bpobj.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/src/uts/common/fs/zfs/bpobj.c b/usr/src/uts/common/fs/zfs/bpobj.c
index 7d200965b51e..7a747b389a98 100644
--- a/usr/src/uts/common/fs/zfs/bpobj.c
+++ b/usr/src/uts/common/fs/zfs/bpobj.c
@@ -300,8 +300,10 @@ bpobj_iterate_impl(bpobj_t *bpo, bpobj_itor_t func, void *arg, dmu_tx_t *tx,
 		if (free) {
 			err = bpobj_space(&sublist,
 			    &used_before, &comp_before, &uncomp_before);
-			if (err)
+			if (err != 0) {
+				bpobj_close(&sublist);
 				break;
+			}
 		}
 		err = bpobj_iterate_impl(&sublist, func, arg, tx, free);
 		if (free) {