svn commit: r363602 - stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Mark Johnston]

Author: markj
Date: Mon Jul 27 14:10:12 2020
New Revision: 363602
URL: https://svnweb.freebsd.org/changeset/base/363602

Log:
  MFC r363373:
  Fix a memory leak in dsl_scan_visitbp().
  
  PR:	247445

Modified:
  stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
==============================================================================
--- stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c	Mon Jul 27 14:09:37 2020	(r363601)
+++ stable/12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c	Mon Jul 27 14:10:12 2020	(r363602)
@@ -1786,7 +1786,7 @@ dsl_scan_visitbp(blkptr_t *bp, const zbookmark_phys_t 
 	*bp_toread = *bp;
 
 	if (dsl_scan_recurse(scn, ds, ostype, dnp, bp_toread, zb, tx) != 0)
-		return;
+		goto out;
 
 	/*
 	 * If dsl_scan_ddt() has already visited this block, it will have