From owner-svn-src-all@FreeBSD.ORG  Mon Oct 19 18:31:39 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9600C1065672;
	Mon, 19 Oct 2009 18:31:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8382B8FC18;
	Mon, 19 Oct 2009 18:31:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9JIVd8T009237;
	Mon, 19 Oct 2009 18:31:39 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9JIVdQd009235;
	Mon, 19 Oct 2009 18:31:39 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200910191831.n9JIVdQd009235@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 19 Oct 2009 18:31:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198241 - in stable/8/sys: . amd64/include/xen
	boot/i386/zfsboot cddl/contrib/opensolaris contrib/dev/acpica
	contrib/pf dev/xen/xenpci
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Oct 2009 18:31:39 -0000

Author: jhb
Date: Mon Oct 19 18:31:39 2009
New Revision: 198241
URL: http://svn.freebsd.org/changeset/base/198241

Log:
  MFC 198079:
  Use zfs_read() instead of xfsread() to read /boot.config.  xfsread() fails
  short read requests, so the result was that a /boot.config smaller than 512
  bytes was ignored.  boot2 uses fsread() instead of xfsread() to read
  /boot.config already, so this makes zfsboot more like boot2.
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/boot/i386/zfsboot/zfsboot.c
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- stable/8/sys/boot/i386/zfsboot/zfsboot.c	Mon Oct 19 18:06:49 2009	(r198240)
+++ stable/8/sys/boot/i386/zfsboot/zfsboot.c	Mon Oct 19 18:31:39 2009	(r198241)
@@ -609,7 +609,7 @@ main(void)
 
     if (zfs_lookup(spa, PATH_CONFIG, &dn) == 0) {
 	off = 0;
-	xfsread(&dn, &off, cmd, sizeof(cmd));
+	zfs_read(spa, &dn, &off, cmd, sizeof(cmd));
     }
 
     if (*cmd) {