svn commit: r199275 - releng/8.0/sys/cddl/boot/zfs
Robert Noland
rnoland at FreeBSD.org
Sat Nov 14 18:42:09 UTC 2009
Author: rnoland
Date: Sat Nov 14 18:42:09 2009
New Revision: 199275
URL: http://svn.freebsd.org/changeset/base/199275
Log:
MFC r199241
This patch addresses an overflow in the the zfs boot code and allows
users to boot from zfs raidz volumes. This has been tested by a number
of users and does not impact those which are not booting from zfs raidz
volumes.
Submitted by: Matt Reimer <mattjreimer at gmail.com>
Approved by: re (kib)
Modified:
releng/8.0/sys/cddl/boot/zfs/zfssubr.c
Directory Properties:
releng/8.0/sys/ (props changed)
releng/8.0/sys/amd64/include/xen/ (props changed)
releng/8.0/sys/cddl/contrib/opensolaris/ (props changed)
releng/8.0/sys/contrib/dev/acpica/ (props changed)
releng/8.0/sys/contrib/pf/ (props changed)
releng/8.0/sys/dev/xen/xenpci/ (props changed)
Modified: releng/8.0/sys/cddl/boot/zfs/zfssubr.c
==============================================================================
--- releng/8.0/sys/cddl/boot/zfs/zfssubr.c Sat Nov 14 18:14:07 2009 (r199274)
+++ releng/8.0/sys/cddl/boot/zfs/zfssubr.c Sat Nov 14 18:42:09 2009 (r199275)
@@ -550,7 +550,8 @@ vdev_raidz_read(vdev_t *vdev, const blkp
uint64_t s = psize >> unit_shift;
uint64_t f = b % dcols;
uint64_t o = (b / dcols) << unit_shift;
- int q, r, c, c1, bc, col, acols, coff, devidx, asize, n;
+ uint64_t q, r, coff;
+ int c, c1, bc, col, acols, devidx, asize, n;
static raidz_col_t cols[16];
raidz_col_t *rc, *rc1;
More information about the svn-src-all
mailing list