mirror of
git://git.9front.org/plan9front/plan9front
synced 2025-01-12 11:10:06 +00:00
merge
This commit is contained in:
commit
ce4926cfc2
1 changed files with 7 additions and 10 deletions
|
@ -735,18 +735,15 @@ getblk(Bptr bp, int flg)
|
||||||
}
|
}
|
||||||
if((b = cacheget(bp.addr)) != nil){
|
if((b = cacheget(bp.addr)) != nil){
|
||||||
assert(checkflag(b, 0, Bfreed));
|
assert(checkflag(b, 0, Bfreed));
|
||||||
b->lasthold = getcallerpc(&bp);
|
assert(b->bp.gen == bp.gen);
|
||||||
qunlock(&fs->blklk[i]);
|
} else {
|
||||||
poperror();
|
b = cachepluck();
|
||||||
return b;
|
b->alloced = getcallerpc(&bp);
|
||||||
|
readblk(b, bp, flg);
|
||||||
|
b->bp.gen = bp.gen;
|
||||||
|
cacheins(b);
|
||||||
}
|
}
|
||||||
b = cachepluck();
|
|
||||||
b->alloced = getcallerpc(&bp);
|
|
||||||
b->alloced = getcallerpc(&bp);
|
|
||||||
readblk(b, bp, flg);
|
|
||||||
b->bp.gen = bp.gen;
|
|
||||||
b->lasthold = getcallerpc(&bp);
|
b->lasthold = getcallerpc(&bp);
|
||||||
cacheins(b);
|
|
||||||
qunlock(&fs->blklk[i]);
|
qunlock(&fs->blklk[i]);
|
||||||
poperror();
|
poperror();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue