svn commit: r284509 - stable/10/sys/boot/zfs

[Andriy Gapon]

Author: avg
Date: Wed Jun 17 11:47:06 2015
New Revision: 284509
URL: https://svnweb.freebsd.org/changeset/base/284509

Log:
  MFC r284025,284032: dnode_read: handle hole blocks in zfs boot code
  
  PR:		199804

Modified:
  stable/10/sys/boot/zfs/zfsimpl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/zfs/zfsimpl.c
==============================================================================
--- stable/10/sys/boot/zfs/zfsimpl.c	Wed Jun 17 10:20:59 2015	(r284508)
+++ stable/10/sys/boot/zfs/zfsimpl.c	Wed Jun 17 11:47:06 2015	(r284509)
@@ -1255,6 +1255,10 @@ dnode_read(const spa_t *spa, const dnode
 			ibn = bn >> ((nlevels - i - 1) * ibshift);
 			ibn &= ((1 << ibshift) - 1);
 			bp = indbp[ibn];
+			if (BP_IS_HOLE(&bp)) {
+				memset(dnode_cache_buf, 0, bsize);
+				break;
+			}
 			rc = zio_read(spa, &bp, dnode_cache_buf);
 			if (rc)
 				return (rc);