diff options
| author | Russ Cox <rsc@swtch.com> | 2007-08-23 11:10:58 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2007-08-23 11:10:58 -0400 |
| commit | 6610dac99c6e7370aa0a1d6d0521e301533dc61e (patch) | |
| tree | c156cdfb0152defcfd6dd0243227cf080e5b99ac /src/cmd/venti | |
| parent | 92baf59b693e2f2a624e6f4fc7262c438103664d (diff) | |
| download | plan9port-6610dac99c6e7370aa0a1d6d0521e301533dc61e.tar.gz plan9port-6610dac99c6e7370aa0a1d6d0521e301533dc61e.tar.bz2 plan9port-6610dac99c6e7370aa0a1d6d0521e301533dc61e.zip | |
venti: avoid race in mirrorarenas (Michael Kaminsky)
Diffstat (limited to 'src/cmd/venti')
| -rw-r--r-- | src/cmd/venti/srv/mirrorarenas.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/cmd/venti/srv/mirrorarenas.c b/src/cmd/venti/srv/mirrorarenas.c index b16472bb..8b72f1a5 100644 --- a/src/cmd/venti/srv/mirrorarenas.c +++ b/src/cmd/venti/srv/mirrorarenas.c @@ -93,6 +93,7 @@ ewritepart(Part *p, u64int offset, u8int *buf, u32int count) * src with writing dst during copy. This is an easy factor of two * (almost) in performance. */ +static Write wsync; static void writeproc(void *v) { @@ -100,7 +101,7 @@ writeproc(void *v) USED(v); while((w = recvp(writechan)) != nil){ - if(w->n == 0) + if(w == &wsync) continue; if(ewritepart(dst, w->o, w->p, w->n) < 0) w->error = 1; @@ -147,11 +148,7 @@ copy(uvlong start, uvlong end, char *what, DigestState *ds) /* * wait for queued write to finish */ - w[i].p = nil; - w[i].o = 0; - w[i].n = 0; - w[i].error = 0; - sendp(writechan, &w[i]); + sendp(writechan, &wsync); i = 1-i; if(w[i].error) return -1; |