diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/fs/ext2fs/ext2_alloc.c | 12 | ||||
| -rw-r--r-- | sys/fs/ext2fs/ext2_balloc.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/fs/ext2fs/ext2_alloc.c b/sys/fs/ext2fs/ext2_alloc.c index 3bd5f3a3bbe1..15b8354bda51 100644 --- a/sys/fs/ext2fs/ext2_alloc.c +++ b/sys/fs/ext2fs/ext2_alloc.c @@ -223,7 +223,7 @@ ext2_reallocblks(struct vop_reallocblks_args *ap) brelse(sbp); return (ENOSPC); } - sbap = (int32_t *)sbp->b_data; + sbap = (u_int *)sbp->b_data; soff = idp->in_off; } /* @@ -239,7 +239,7 @@ ext2_reallocblks(struct vop_reallocblks_args *ap) ssize = len - (idp->in_off + 1); if (bread(vp, idp->in_lbn, (int)fs->e2fs_bsize, NOCRED, &ebp)) goto fail; - ebap = (int32_t *)ebp->b_data; + ebap = (u_int *)ebp->b_data; } /* * Find the preferred location for the cluster. @@ -442,10 +442,10 @@ ext2_dirpref(struct inode *pip) { struct m_ext2fs *fs; int cg, prefcg, dirsize, cgsize; - int avgifree, avgbfree, avgndir, curdirsize; - int minifree, minbfree, maxndir; - int mincg, minndir; - int maxcontigdirs; + u_int avgifree, avgbfree, avgndir, curdirsize; + u_int minifree, minbfree, maxndir; + u_int mincg, minndir; + u_int maxcontigdirs; mtx_assert(EXT2_MTX(pip->i_ump), MA_OWNED); fs = pip->i_e2fs; diff --git a/sys/fs/ext2fs/ext2_balloc.c b/sys/fs/ext2fs/ext2_balloc.c index ce73840c407c..81e2d3c46a91 100644 --- a/sys/fs/ext2fs/ext2_balloc.c +++ b/sys/fs/ext2fs/ext2_balloc.c @@ -60,11 +60,11 @@ ext2_balloc(struct inode *ip, int32_t lbn, int size, struct ucred *cred, { struct m_ext2fs *fs; struct ext2mount *ump; - int32_t nb; struct buf *bp, *nbp; struct vnode *vp = ITOV(ip); struct indir indirs[NIADDR + 2]; - uint32_t newb, *bap, pref; + uint32_t nb, newb; + int32_t *bap, pref; int osize, nsize, num, i, error; *bpp = NULL; @@ -165,8 +165,8 @@ ext2_balloc(struct inode *ip, int32_t lbn, int size, struct ucred *cred, EXT2_LOCK(ump); pref = ext2_blkpref(ip, lbn, indirs[0].in_off + EXT2_NDIR_BLOCKS, &ip->i_db[0], 0); - if ((error = ext2_alloc(ip, lbn, pref, - (int)fs->e2fs_bsize, cred, &newb))) + if ((error = ext2_alloc(ip, lbn, pref, fs->e2fs_bsize, cred, + &newb))) return (error); nb = newb; bp = getblk(vp, indirs[1].in_lbn, fs->e2fs_bsize, 0, 0, 0); |