svn commit: r198243 - in stable/7/sys: . boot/i386/zfsboot contrib/pf

[John Baldwin]

Author: jhb
Date: Mon Oct 19 18:52:05 2009
New Revision: 198243
URL: http://svn.freebsd.org/changeset/base/198243

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.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/boot/i386/zfsboot/zfsboot.c
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- stable/7/sys/boot/i386/zfsboot/zfsboot.c	Mon Oct 19 18:46:22 2009	(r198242)
+++ stable/7/sys/boot/i386/zfsboot/zfsboot.c	Mon Oct 19 18:52:05 2009	(r198243)
@@ -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) {