diff options
| author | Russ Cox <rsc@swtch.com> | 2007-10-29 14:33:17 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2007-10-29 14:33:17 -0400 |
| commit | 45ac814c8609174199cadb6f1bbb4baf7c12c94a (patch) | |
| tree | 49f4b2120a36b080a0ffe8f9988c21db7b97656c /src/cmd/venti/srv/arena.c | |
| parent | c5a183de108e5685305734d5cf984b58bb0d614a (diff) | |
| download | plan9port-45ac814c8609174199cadb6f1bbb4baf7c12c94a.tar.gz plan9port-45ac814c8609174199cadb6f1bbb4baf7c12c94a.tar.bz2 plan9port-45ac814c8609174199cadb6f1bbb4baf7c12c94a.zip | |
venti: fix sync deadlock, add /proc stub
Diffstat (limited to 'src/cmd/venti/srv/arena.c')
| -rw-r--r-- | src/cmd/venti/srv/arena.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/cmd/venti/srv/arena.c b/src/cmd/venti/srv/arena.c index c576e9aa..1a75c695 100644 --- a/src/cmd/venti/srv/arena.c +++ b/src/cmd/venti/srv/arena.c @@ -293,13 +293,12 @@ ZZZ question: should this distinguish between an arena filling up and real errors writing the clump? */ u64int -writeaclump(Arena *arena, Clump *c, u8int *clbuf, u64int start, u64int *pa) +writeaclump(Arena *arena, Clump *c, u8int *clbuf) { DBlock *b; u64int a, aa; u32int clump, n, nn, m, off, blocksize; int ok; - AState as; n = c->info.size + ClumpSize + U32Size; qlock(&arena->lock); @@ -309,10 +308,6 @@ writeaclump(Arena *arena, Clump *c, u8int *clbuf, u64int start, u64int *pa) if(!arena->memstats.sealed){ logerr(EOk, "seal memstats %s", arena->name); arena->memstats.sealed = 1; - as.arena = arena; - as.aa = start+aa; - as.stats = arena->memstats; - setdcachestate(&as); } qunlock(&arena->lock); return TWID64; @@ -390,14 +385,6 @@ NoCIG: writeclumpinfo(arena, clump, &c->info); wbarena(arena); - /* set up for call to setdcachestate */ - as.arena = arena; - as.aa = start+arena->memstats.used; - as.stats = arena->memstats; - - /* update this before calling setdcachestate so it cannot be behind dcache.diskstate */ - *pa = start+aa; - setdcachestate(&as); qunlock(&arena->lock); return aa; |