From owner-svn-src-head@FreeBSD.ORG  Wed Jun 13 08:00:33 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 93729106566B;
	Wed, 13 Jun 2012 08:00:33 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 7FCD88FC12;
	Wed, 13 Jun 2012 08:00:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5D80XGC005402;
	Wed, 13 Jun 2012 08:00:33 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5D80XGY005400;
	Wed, 13 Jun 2012 08:00:33 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201206130800.q5D80XGY005400@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 13 Jun 2012 08:00:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237001 - head/sys/boot/zfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jun 2012 08:00:33 -0000

Author: mm
Date: Wed Jun 13 08:00:32 2012
New Revision: 237001
URL: http://svn.freebsd.org/changeset/base/237001

Log:
  Fix ZFS boot with pre-features pools (version <= 28) broken in r236884
  
  Reported by:	mav
  MFC after:	1 month

Modified:
  head/sys/boot/zfs/zfsimpl.c

Modified: head/sys/boot/zfs/zfsimpl.c
==============================================================================
--- head/sys/boot/zfs/zfsimpl.c	Wed Jun 13 06:57:55 2012	(r237000)
+++ head/sys/boot/zfs/zfsimpl.c	Wed Jun 13 08:00:32 2012	(r237001)
@@ -888,9 +888,10 @@ vdev_probe(vdev_phys_read_t *read, void 
 	}
 
 	/* Check ZFS features for read */
-	rc = nvlist_find(nvlist, ZPOOL_CONFIG_FEATURES_FOR_READ,
-			 DATA_TYPE_NVLIST, 0, &features);
-	if (nvlist_check_features_for_read(features) != 0)
+	if (nvlist_find(nvlist,
+			ZPOOL_CONFIG_FEATURES_FOR_READ,
+			DATA_TYPE_NVLIST, 0, &features) == 0
+	    && nvlist_check_features_for_read(features) != 0)
 		return (EIO);
 
 	if (nvlist_find(nvlist,