cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-27 11:52:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

libventi: minor vtfile bug fixes

Browse source
This commit is contained in:
Russ Cox 2008-06-14 23:05:19 -04:00
parent 1309689171
commit e9b70a5f4c
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libventi/file.c
View file

@ -607,7 +607,7 @@ shrinkdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
rb = vtcacheglobal(r->c, e->score, e->type); rb = vtcacheglobal(r->c, e->score, e->type);
if(rb == nil) if(rb == nil)
return 0; return -1;
/* /*
* Walk down to the new root block. * Walk down to the new root block.
@ -748,6 +748,12 @@ vtfileblockscore(VtFile *r, u32int bn, uchar score[VtScoreSize])
if(b == nil) if(b == nil)
return -1; return -1;
if(DEPTH(e.type) == 0){
memmove(score, e.score, VtScoreSize);
vtblockput(b);
return 0;
}
i = mkindices(&e, bn, index); i = mkindices(&e, bn, index);
if(i < 0){ if(i < 0){
vtblockput(b); vtblockput(b);
@ -1058,6 +1064,8 @@ filewrite1(VtFile *f, void *data, long count, vlong offset)
return -1; return -1;
memmove(b->data+frag, data, count); memmove(b->data+frag, data, count);
if(m == VtOWRITE && frag+count < e.dsize)
memset(b->data+frag+count, 0, e.dsize-frag-count);
if(offset+count > e.size){ if(offset+count > e.size){
vtfilegetentry(f, &e); vtfilegetentry(f, &e);
@ -1118,9 +1126,12 @@ flushblock(VtCache *c, VtBlock *bb, uchar score[VtScoreSize], int ppb, int epb,
for(i=0; i<epb; i++){ for(i=0; i<epb; i++){
if(vtentryunpack(&e, b->data, i) < 0) if(vtentryunpack(&e, b->data, i) < 0)
goto Err; goto Err;
if(!(e.flags&VtEntryActive))
continue;
if(flushblock(c, nil, e.score, e.psize/VtScoreSize, e.dsize/VtEntrySize, if(flushblock(c, nil, e.score, e.psize/VtScoreSize, e.dsize/VtEntrySize,
e.type) < 0) e.type) < 0)
goto Err; goto Err;
vtentrypack(&e, b->data, i);
} }
break; break;