63c63
< __FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_alloc.c 202125 2010-01-11 22:42:06Z mckusick $");
---
> __FBSDID("$FreeBSD: head/sys/ufs/ffs/ffs_alloc.c 203763 2010-02-10 20:10:35Z mckusick $");
96c96
< typedef ufs2_daddr_t allocfcn_t(struct inode *ip, int cg, ufs2_daddr_t bpref,
---
> typedef ufs2_daddr_t allocfcn_t(struct inode *ip, u_int cg, ufs2_daddr_t bpref,
99c99
< static ufs2_daddr_t ffs_alloccg(struct inode *, int, ufs2_daddr_t, int);
---
> static ufs2_daddr_t ffs_alloccg(struct inode *, u_int, ufs2_daddr_t, int);
105c105
< static ufs2_daddr_t ffs_clusteralloc(struct inode *, int, ufs2_daddr_t, int);
---
> static ufs2_daddr_t ffs_clusteralloc(struct inode *, u_int, ufs2_daddr_t, int);
109c109,110
< static ufs2_daddr_t ffs_fragextend(struct inode *, int, ufs2_daddr_t, int, int);
---
> static ufs2_daddr_t ffs_fragextend(struct inode *, u_int, ufs2_daddr_t,
> int, int);
112,113c113,114
< (struct inode *, int, ufs2_daddr_t, int, allocfcn_t *);
< static ufs2_daddr_t ffs_nodealloccg(struct inode *, int, ufs2_daddr_t, int);
---
> (struct inode *, u_int, ufs2_daddr_t, int, allocfcn_t *);
> static ufs2_daddr_t ffs_nodealloccg(struct inode *, u_int, ufs2_daddr_t, int);
148c149
< int cg, reclaimed;
---
> u_int cg, reclaimed;
251c252,253
< int cg, request, error, reclaimed;
---
> u_int cg, request, reclaimed;
> int error;
936c938,939
< int cg, error, error1;
---
> u_int cg;
> int error, error1;
1046,1050c1049,1053
< int cg, prefcg, dirsize, cgsize;
< int avgifree, avgbfree, avgndir, curdirsize;
< int minifree, minbfree, maxndir;
< int mincg, minndir;
< int maxcontigdirs;
---
> u_int cg, prefcg, dirsize, cgsize;
> u_int avgifree, avgbfree, avgndir, curdirsize;
> u_int minifree, minbfree, maxndir;
> u_int mincg, minndir;
> u_int maxcontigdirs;
1174,1175c1177,1178
< int cg;
< int avgbfree, startcg;
---
> u_int cg;
> u_int avgbfree, startcg;
1224,1225c1227,1228
< int cg;
< int avgbfree, startcg;
---
> u_int cg;
> u_int avgbfree, startcg;
1278c1281
< int cg;
---
> u_int cg;
1285c1288
< int i, icg = cg;
---
> u_int i, icg = cg;
1336c1339
< int cg;
---
> u_int cg;
1419c1422
< int cg;
---
> u_int cg;
1589c1592
< int cg;
---
> u_int cg;
1713c1716
< int cg;
---
> u_int cg;
1814c1817
< return (cg * fs->fs_ipg + ipref);
---
> return ((ino_t)(cg * fs->fs_ipg + ipref));
1859c1862,1863
< int i, cg, blk, frags, bbase;
---
> int i, blk, frags, bbase;
> u_int cg;
2057c2061,2062
< int error, cg;
---
> int error;
> u_int cg;
2071c2076
< if ((u_int)ino >= fs->fs_ipg * fs->fs_ncg)
---
> if (ino >= fs->fs_ipg * fs->fs_ncg)
2088,2089c2093,2094
< printf("dev = %s, ino = %lu, fs = %s\n", devtoname(dev),
< (u_long)ino + cg * fs->fs_ipg, fs->fs_fsmnt);
---
> printf("dev = %s, ino = %u, fs = %s\n", devtoname(dev),
> ino + cg * fs->fs_ipg, fs->fs_fsmnt);
2124c2129,2130
< int ret, cg;
---
> int ret;
> u_int cg;
2135c2141
< if ((u_int)ino >= fs->fs_ipg * fs->fs_ncg)
---
> if (ino >= fs->fs_ipg * fs->fs_ncg)