version 1.25, 2009/10/19 18:41:17 |
version 1.26, 2013/01/22 09:39:15 |
Line 139 ext2fs_bmaparray(struct vnode *vp, daddr |
|
Line 139 ext2fs_bmaparray(struct vnode *vp, daddr |
|
struct buf *bp, *cbp; |
struct buf *bp, *cbp; |
struct ufsmount *ump; |
struct ufsmount *ump; |
struct mount *mp; |
struct mount *mp; |
struct indir a[NIADDR+1], *xap; |
struct indir a[EXT2FS_NIADDR+1], *xap; |
daddr_t daddr; |
daddr_t daddr; |
daddr_t metalbn; |
daddr_t metalbn; |
int error, maxrun = 0, num; |
int error, maxrun = 0, num; |
Line 163 ext2fs_bmaparray(struct vnode *vp, daddr |
|
Line 163 ext2fs_bmaparray(struct vnode *vp, daddr |
|
maxrun = MAXBSIZE / mp->mnt_stat.f_iosize - 1; |
maxrun = MAXBSIZE / mp->mnt_stat.f_iosize - 1; |
} |
} |
|
|
if (bn >= 0 && bn < NDADDR) { |
if (bn >= 0 && bn < EXT2FS_NDADDR) { |
/* XXX ondisk32 */ |
/* XXX ondisk32 */ |
*bnp = blkptrtodb(ump, fs2h32(ip->i_e2fs_blocks[bn])); |
*bnp = blkptrtodb(ump, fs2h32(ip->i_e2fs_blocks[bn])); |
if (*bnp == 0) |
if (*bnp == 0) |
*bnp = -1; |
*bnp = -1; |
else if (runp) |
else if (runp) |
/* XXX ondisk32 */ |
/* XXX ondisk32 */ |
for (++bn; bn < NDADDR && *runp < maxrun && |
for (++bn; bn < EXT2FS_NDADDR && *runp < maxrun && |
is_sequential(ump, (daddr_t)fs2h32(ip->i_e2fs_blocks[bn - 1]), |
is_sequential(ump, (daddr_t)fs2h32(ip->i_e2fs_blocks[bn - 1]), |
(daddr_t)fs2h32(ip->i_e2fs_blocks[bn])); |
(daddr_t)fs2h32(ip->i_e2fs_blocks[bn])); |
++bn, ++*runp); |
++bn, ++*runp); |
Line 187 ext2fs_bmaparray(struct vnode *vp, daddr |
|
Line 187 ext2fs_bmaparray(struct vnode *vp, daddr |
|
|
|
/* Get disk address out of indirect block array */ |
/* Get disk address out of indirect block array */ |
/* XXX ondisk32 */ |
/* XXX ondisk32 */ |
daddr = fs2h32(ip->i_e2fs_blocks[NDADDR + xap->in_off]); |
daddr = fs2h32(ip->i_e2fs_blocks[EXT2FS_NDADDR + xap->in_off]); |
|
|
#ifdef DIAGNOSTIC |
#ifdef DIAGNOSTIC |
if (num > NIADDR + 1 || num < 1) { |
if (num > EXT2FS_NIADDR + 1 || num < 1) { |
printf("ext2fs_bmaparray: num=%d\n", num); |
printf("ext2fs_bmaparray: num=%d\n", num); |
panic("ext2fs_bmaparray: num"); |
panic("ext2fs_bmaparray: num"); |
} |
} |