summaryrefslogtreecommitdiffstats
path: root/sys/boot/zfs/zfsimpl.c
diff options
context:
space:
mode:
authordfr <dfr@FreeBSD.org>2008-12-17 18:12:01 +0000
committerdfr <dfr@FreeBSD.org>2008-12-17 18:12:01 +0000
commit5823684a8bbc5e636847662bda2493b619b88729 (patch)
tree325a98bccb4e2bf666bc5f802e64fa6255b143c0 /sys/boot/zfs/zfsimpl.c
parentad33ad441f63b1b0b7de1ae4d5d8d49f59a48d22 (diff)
downloadFreeBSD-src-5823684a8bbc5e636847662bda2493b619b88729.zip
FreeBSD-src-5823684a8bbc5e636847662bda2493b619b88729.tar.gz
Use full 64bit arithmetic when converting file offsets to block numbers - fixes
booting on filesystems with inode numbers with values above 4194304. Submitted by: ps
Diffstat (limited to 'sys/boot/zfs/zfsimpl.c')
-rw-r--r--sys/boot/zfs/zfsimpl.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/boot/zfs/zfsimpl.c b/sys/boot/zfs/zfsimpl.c
index a6dc99e..e6695cf 100644
--- a/sys/boot/zfs/zfsimpl.c
+++ b/sys/boot/zfs/zfsimpl.c
@@ -873,17 +873,12 @@ dnode_read(spa_t *spa, const dnode_phys_t *dnode, off_t offset, void *buf, size_
int i, rc;
/*
- * We truncate the offset to 32bits, mainly so that I don't
- * have to find a copy of __divdi3 to put into the bootstrap.
- * I don't think the bootstrap needs to access anything bigger
- * than 2G anyway. Note that block addresses are still 64bit
- * so it doesn't affect the possible size of the media.
- * We still use 64bit block numbers so that the bitshifts
- * work correctly. Note: bsize may not be a power of two here.
+ * Note: bsize may not be a power of two here so we need to do an
+ * actual divide rather than a bitshift.
*/
while (buflen > 0) {
- uint64_t bn = ((int) offset) / bsize;
- int boff = ((int) offset) % bsize;
+ uint64_t bn = offset / bsize;
+ int boff = offset % bsize;
int ibn;
const blkptr_t *indbp;
blkptr_t bp;
OpenPOWER on IntegriCloud