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

ext2 fixes

Browse source
This commit is contained in:
rsc 2006-05-04 18:02:13 +00:00
parent 6802a89995
commit e77222a4ec
2 changed files with 37 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/libdiskfs/ext2.c
View file

@ -6,7 +6,7 @@
#include <diskfs.h> #include <diskfs.h>
#include "ext2.h" #include "ext2.h"
#define debug 1 #define debug 0
static int ext2sync(Fsys*); static int ext2sync(Fsys*);
static void ext2close(Fsys*); static void ext2close(Fsys*);
@ -111,8 +111,10 @@ ext2blockread(Fsys *fsys, u64int vbno)
fprint(2, "loading group: %r..."); fprint(2, "loading group: %r...");
return nil; return nil;
} }
/* if(debug) */ /*
/* fprint(2, "group %d bitblock=%d...", bno/fs->blockspergroup, g->bitblock); */ if(debug)
fprint(2, "group %d bitblock=%d...", bno/fs->blockspergroup, g->bitblock);
*/
if((bitb = diskread(fs->disk, fs->blocksize, (u64int)g->bitblock*fs->blocksize)) == nil){ if((bitb = diskread(fs->disk, fs->blocksize, (u64int)g->bitblock*fs->blocksize)) == nil){
if(debug) if(debug)
@ -138,7 +140,7 @@ static Block*
ext2datablock(Ext2 *fs, u32int bno, int size) ext2datablock(Ext2 *fs, u32int bno, int size)
{ {
USED(size); USED(size);
return ext2blockread(fs->fsys, bno+fs->firstblock); return ext2blockread(fs->fsys, bno);
} }
static Block* static Block*
@ -605,15 +607,12 @@ ext2readdir(Fsys *fsys, SunAuthUnix *au, Nfs3Handle *h, u32int count, u64int coo
if(debug) fprint(2, "bad namlen %d reclen %d at offset %d of %d\n", de->namlen, de->reclen, (int)(p-b->data), b->len); if(debug) fprint(2, "bad namlen %d reclen %d at offset %d of %d\n", de->namlen, de->reclen, (int)(p-b->data), b->len);
break; break;
} }
if(de->name[de->namlen] != 0){ if(debug) print("%.*s/%d ", de->namlen, de->name, (int)de->ino);
if(debug) fprint(2, "bad name %d %.*s\n", de->namlen, de->namlen, de->name);
continue;
}
if(debug) print("%s/%d ", de->name, (int)de->ino);
if((uchar*)de - b->data < off) if((uchar*)de - b->data < off)
continue; continue;
e.fileid = de->ino; e.fileid = de->ino;
e.name = de->name; e.name = de->name;
e.namelen = de->namlen;
e.cookie = (u64int)i*fs->blocksize + (p - b->data); e.cookie = (u64int)i*fs->blocksize + (p - b->data);
if(nfs3entrypack(dp, dep, &ndp, &e) < 0){ if(nfs3entrypack(dp, dep, &ndp, &e) < 0){
done = 1; done = 1;

61
src/libdiskfs/venti.c
View file

@ -41,38 +41,7 @@ vtfileindices(VtEntry *e, u32int bn, int *index)
return i; return i;
} }
static VtBlock* VtBlock *_vtfileblock(VtCache*, VtEntry*, u32int); /* avoid auto-inline by putting later in file */
_vtfileblock(VtCache *c, VtEntry *e, u32int bn)
{
VtBlock *b, *bb;
int i, d, index[VtPointerDepth+1], t;
i = vtfileindices(e, bn, index);
if(i < 0)
return nil;
d = (e->type&VtTypeDepthMask);
if(i > d){
werrstr("bad address %d > %d (%x %x)", i, d, e->type, e->flags);
return nil;
}
/*fprint(2, "vtread %V\n", e->score); */
b = vtcacheglobal(c, e->score, e->type);
if(b == nil)
return nil;
for(i=d-1; i>=0; i--){
t = VtDataType+i;
/*fprint(2, "vtread %V\n", b->data+index[i]*VtScoreSize); */
bb = vtcacheglobal(c, b->data+index[i]*VtScoreSize, t);
vtblockput(b);
if(bb == nil)
return nil;
b = bb;
}
return b;
}
static void static void
diskventiblockput(Block *b) diskventiblockput(Block *b)
{ {
@ -109,6 +78,34 @@ nfilereads++;
return b; return b;
} }
VtBlock*
_vtfileblock(VtCache *c, VtEntry *e, u32int bn)
{
VtBlock *b, *bb;
int i, d, index[VtPointerDepth+1], t;
uchar score[VtScoreSize];
i = vtfileindices(e, bn, index);
if(i < 0)
return nil;
d = (e->type&VtTypeDepthMask);
if(i > d){
werrstr("bad address %d > %d (%x %x)", i, d, e->type, e->flags);
return nil;
}
/*fprint(2, "vtread %V\n", e->score); */
b = vtcacheglobal(c, e->score, e->type);
for(i=d-1; i>=0 && b; i--){
t = VtDataType+i;
/*fprint(2, "vtread %V\n", b->data+index[i]*VtScoreSize); */
memmove(score, b->data+index[i]*VtScoreSize, VtScoreSize);
vtblockput(b);
b = vtcacheglobal(c, score, t);
}
return b;
}
static void static void
diskventiclose(Disk *dd) diskventiclose(Disk *dd)
{ {