o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more ext2 fixes

Browse source
This commit is contained in:
rsc 2006-06-15 05:16:59 +00:00
parent 9bbcb80d35
commit c1a4592dd1
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/libdiskfs/ext2.c
View file

@ -88,7 +88,8 @@ ext2blockread(Fsys *fsys, u64int vbno)
Group *g; Group *g;
Block *gb; Block *gb;
uchar *bits; uchar *bits;
u32int bno, boff, bitpos; u32int bno, boff, bitblock;
u64int bitpos;
Ext2 *fs; Ext2 *fs;
fs = fsys->priv; fs = fsys->priv;
@ -112,10 +113,20 @@ ext2blockread(Fsys *fsys, u64int vbno)
return nil; return nil;
} }
/* /*
if(debug)
fprint(2, "ext2 group %d: bitblock=%ud inodebitblock=%ud inodeaddr=%ud freeblocks=%ud freeinodes=%ud useddirs=%ud\n",
(int)(bno/fs->blockspergroup),
g->bitblock,
g->inodebitblock,
g->inodeaddr,
g->freeblockscount,
g->freeinodescount,
g->useddirscount);
if(debug) if(debug)
fprint(2, "group %d bitblock=%d...", bno/fs->blockspergroup, g->bitblock); fprint(2, "group %d bitblock=%d...", bno/fs->blockspergroup, g->bitblock);
*/ */
bitpos = (u64int)g->bitblock*fs->blocksize; bitblock = g->bitblock;
bitpos = (u64int)bitblock*fs->blocksize;
blockput(gb); blockput(gb);
if((bitb = diskread(fs->disk, fs->blocksize, bitpos)) == nil){ if((bitb = diskread(fs->disk, fs->blocksize, bitpos)) == nil){
@ -127,7 +138,12 @@ ext2blockread(Fsys *fsys, u64int vbno)
boff = bno%fs->blockspergroup; boff = bno%fs->blockspergroup;
if((bits[boff>>3] & (1<<(boff&7))) == 0){ if((bits[boff>>3] & (1<<(boff&7))) == 0){
if(debug) if(debug)
fprint(2, "block %d not allocated...", bno); fprint(2, "block %d not allocated in group %d: bitblock %d/%lld bits[%d] = %#x\n",
boff, bno/fs->blockspergroup,
(int)bitblock,
bitpos,
boff>>3,
bits[boff>>3]);
blockput(bitb); blockput(bitb);
return nil; return nil;
} }