Commit Diff


commit - e9254adc8f015c3ed422ce488801ed123c4a0749
commit + c1e6f6426f830d662054960543054b0ae40a8504
blob - 9e174e72a65df53e91170c59639a0f258647774b
blob + bb0bb03d3bbf4ed3f4a3b2c090fcdaae6e7e5a36
--- src/cmd/vac/file.c
+++ src/cmd/vac/file.c
@@ -640,7 +640,7 @@ filemapblock(VacFile *f, ulong bn, uchar score[VtScore
 		vtentrypack(&e, b->data, f->source->offset % f->source->epb);
 	}else
 		memmove(b->data + (bn%(e.psize/VtScoreSize))*VtScoreSize, score, VtScoreSize);
-	vtblockdirty(b);
+	/* vtblockdirty(b); */
 	vtblockput(b);
 	vtfileunlock(s);
 	fileunlock(f);
@@ -738,7 +738,7 @@ if(0)fprint(2, "fileWrite: %s %d, %lld\n", f->dir.elem
 		p += n;
 		offset += n;
 		bn++;
-		vtblockdirty(b);
+		/* vtblockdirty(b); */
 		vtblockput(b);
 	}
 	if(offset > eof && vtfilesetsize(s, offset) < 0)
@@ -1084,7 +1084,7 @@ if(0)fprint(2, "old size %d new size %d\n", me.size, n
 		vdpack(&f->dir, &me);
 		mbinsert(&mb, i, &me);
 		mbpack(&mb);
-		vtblockdirty(b);
+		/* vtblockdirty(b); */
 		vtblockput(b);
 		vtfileunlock(fp->msource);
 		f->dirty = 0;
@@ -1104,7 +1104,7 @@ if(0)fprint(2, "old size %d new size %d\n", me.size, n
 	if(boff == NilBlock){
 		/* mbResize might have modified block */
 		mbpack(&mb);
-		vtblockdirty(b);
+		/* vtblockdirty(b); */
 		goto Err;
 	}
 fprint(2, "fileMetaFlush moving entry from %ud -> %ud\n", f->boff, boff);
@@ -1116,7 +1116,7 @@ fprint(2, "fileMetaFlush moving entry from %ud -> %ud\
 	mbpack(&mb);
 //	blockDependency(b, bb, -1, nil, nil);
 	vtblockput(bb);
-	vtblockdirty(b);
+	/* vtblockdirty(b); */
 	vtblockput(b);
 	vtfileunlock(fp->msource);
 
@@ -1159,7 +1159,7 @@ filemetaremove(VacFile *f, char *uid)
 	mbpack(&mb);
 	vtfileunlock(up->msource);
 
-	vtblockdirty(b);
+	/* vtblockdirty(b); */
 	vtblockput(b);
 
 	f->removed = 1;
@@ -1562,7 +1562,7 @@ filemetaalloc(VacFile *f, VacDir *dir, u32int start)
 	if(p == nil){
 		/* mbAlloc might have changed block */
 		mbpack(&mb);
-		vtblockdirty(b);
+		/* vtblockdirty(b); */
 		werrstr(EBadMeta);
 		goto Err;
 	}
@@ -1593,7 +1593,7 @@ filemetaalloc(VacFile *f, VacDir *dir, u32int start)
 	}
 #endif
 
-	vtblockdirty(b);
+	/* vtblockdirty(b); */
 	vtblockput(b);
 	return bo;
 Err:
@@ -1792,7 +1792,7 @@ setEntry(Source *r, Entry *e)
 	/* BUG b should depend on the entry pointer */
 
 	markCopied(b);
-	vtblockdirty(b);
+	/* vtblockdirty(b); */
 	vtblockput(b);
 	return 1;
 }
blob - 0034a27d85ed4613e842dcda65db85f1025d90b9
blob + f635d5d1147f11ccf99ecab3d8646d8d8a3dea29
--- src/cmd/vac/fs.c
+++ src/cmd/vac/fs.c
@@ -14,7 +14,7 @@ vacfsalloc(VtConn *z, int bsize, int ncache, int mode)
 	fs->ref = 1;
 	fs->z = z;
 	fs->bsize = bsize;
-	fs->cache = vtcachealloc(z, bsize, ncache, mode);
+	fs->cache = vtcachealloc(z, bsize, ncache);
 	return fs;
 }
 
blob - 7c245fc298b0e66c6cbb676f87fbcad9d488df9e
blob + 89b307c6a3d91e083674c500c8caa0fa58499c6d
--- src/libventi/file.c
+++ src/libventi/file.c
@@ -86,6 +86,7 @@ vtfilealloc(VtCache *c, VtBlock *b, VtFile *p, u32int 
 	r->c = c;
 	r->mode = mode;
 	r->dsize = e.dsize;
+	r->psize = e.psize;
 	r->gen = e.gen;
 	r->dir = (e.type & VtTypeBaseMask) == VtDirType;
 	r->ref = 1;