mirror of
https://github.com/9fans/plan9port.git
synced 2025-01-24 11:41:58 +00:00
libventi: minor vtfile bug fixes
This commit is contained in:
parent
1309689171
commit
e9b70a5f4c
1 changed files with 12 additions and 1 deletions
|
@ -607,7 +607,7 @@ shrinkdepth(VtFile *r, VtBlock *p, VtEntry *e, int depth)
|
|||
|
||||
rb = vtcacheglobal(r->c, e->score, e->type);
|
||||
if(rb == nil)
|
||||
return 0;
|
||||
return -1;
|
||||
|
||||
/*
|
||||
* Walk down to the new root block.
|
||||
|
@ -748,6 +748,12 @@ vtfileblockscore(VtFile *r, u32int bn, uchar score[VtScoreSize])
|
|||
if(b == nil)
|
||||
return -1;
|
||||
|
||||
if(DEPTH(e.type) == 0){
|
||||
memmove(score, e.score, VtScoreSize);
|
||||
vtblockput(b);
|
||||
return 0;
|
||||
}
|
||||
|
||||
i = mkindices(&e, bn, index);
|
||||
if(i < 0){
|
||||
vtblockput(b);
|
||||
|
@ -1058,6 +1064,8 @@ filewrite1(VtFile *f, void *data, long count, vlong offset)
|
|||
return -1;
|
||||
|
||||
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){
|
||||
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++){
|
||||
if(vtentryunpack(&e, b->data, i) < 0)
|
||||
goto Err;
|
||||
if(!(e.flags&VtEntryActive))
|
||||
continue;
|
||||
if(flushblock(c, nil, e.score, e.psize/VtScoreSize, e.dsize/VtEntrySize,
|
||||
e.type) < 0)
|
||||
goto Err;
|
||||
vtentrypack(&e, b->data, i);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
Loading…
Reference in a new issue