From owner-svn-src-stable@FreeBSD.ORG  Wed Jun 17 12:43:09 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9FEC02CFF;
 Wed, 17 Jun 2015 12:43:08 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 60038C34;
 Wed, 17 Jun 2015 12:43:08 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5HBl7s6042084;
 Wed, 17 Jun 2015 11:47:07 GMT (envelope-from avg@FreeBSD.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5HBl7RF042083;
 Wed, 17 Jun 2015 11:47:07 GMT (envelope-from avg@FreeBSD.org)
Message-Id: <201506171147.t5HBl7RF042083@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: avg set sender to avg@FreeBSD.org
 using -f
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 17 Jun 2015 11:47:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r284509 - stable/10/sys/boot/zfs
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 17 Jun 2015 12:43:09 -0000

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);