greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mkfs must be compiled 32-bit. Fix mkfs warnings

Browse source
This commit is contained in:
Austin Clements 2010-08-31 15:11:10 -04:00
parent 1e8035be53
commit 880ee18ab1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -127,7 +127,7 @@ _forktest: forktest.o $(ULIB)
$(OBJDUMP) -S _forktest > forktest.asm $(OBJDUMP) -S _forktest > forktest.asm
mkfs: mkfs.c fs.h mkfs: mkfs.c fs.h
gcc -Wall -o mkfs mkfs.c gcc -m32 -Werror -Wall -o mkfs mkfs.c
UPROGS=\ UPROGS=\
_cat\ _cat\

4
mkfs.c
View file

@ -82,7 +82,7 @@ main(int argc, char *argv[])
usedblocks = ninodes / IPB + 3 + bitblocks; usedblocks = ninodes / IPB + 3 + bitblocks;
freeblock = usedblocks; freeblock = usedblocks;
printf("used %d (bit %d ninode %lu) free %u total %d\n", usedblocks, printf("used %d (bit %d ninode %u) free %u total %d\n", usedblocks,
bitblocks, ninodes/IPB + 1, freeblock, nblocks+usedblocks); bitblocks, ninodes/IPB + 1, freeblock, nblocks+usedblocks);
assert(nblocks + usedblocks == size); assert(nblocks + usedblocks == size);
@ -230,7 +230,7 @@ balloc(int used)
for(i = 0; i < used; i++) { for(i = 0; i < used; i++) {
buf[i/8] = buf[i/8] | (0x1 << (i%8)); buf[i/8] = buf[i/8] | (0x1 << (i%8));
} }
printf("balloc: write bitmap block at sector %lu\n", ninodes/IPB + 3); printf("balloc: write bitmap block at sector %u\n", ninodes/IPB + 3);
wsect(ninodes / IPB + 3, buf); wsect(ninodes / IPB + 3, buf);
} }