summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorps <ps@FreeBSD.org>2009-11-13 02:50:50 +0000
committerps <ps@FreeBSD.org>2009-11-13 02:50:50 +0000
commitd4b7dcebd337deaf973f7de76bbe1e3f1e300279 (patch)
tree12360ba78679fe93d2db0c2a919d5bfc3ca6a55c
parent04efa63a3f61af940cf02004dcfdfaac0de1d81d (diff)
downloadFreeBSD-src-d4b7dcebd337deaf973f7de76bbe1e3f1e300279.zip
FreeBSD-src-d4b7dcebd337deaf973f7de76bbe1e3f1e300279.tar.gz
Correct another case of not doing 64bit math. This allows mine and
other raidz2 volumes to boot. Submitted by: Matt Reimer <mattjreimer@gmail.com>
-rw-r--r--sys/cddl/boot/zfs/zfssubr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/cddl/boot/zfs/zfssubr.c b/sys/cddl/boot/zfs/zfssubr.c
index fb4444f..4013986 100644
--- a/sys/cddl/boot/zfs/zfssubr.c
+++ b/sys/cddl/boot/zfs/zfssubr.c
@@ -550,7 +550,8 @@ vdev_raidz_read(vdev_t *vdev, const blkptr_t *bp, void *buf,
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;
OpenPOWER on IntegriCloud