vacfs: present qids correctly
diff --git a/src/cmd/vac/file.c b/src/cmd/vac/file.c
index fac419b..9ae5530 100644
--- a/src/cmd/vac/file.c
+++ b/src/cmd/vac/file.c
@@ -142,9 +142,16 @@
vacfilegetid(VacFile *f)
{
/* immutable */
+fprint(2, "getid %s %lld+%lld = %lld\n", f->dir.elem, f->qidoffset, f->dir.qid, f->qidoffset+f->dir.qid);
return f->qidoffset + f->dir.qid;
}
+uvlong
+vacfilegetqidoffset(VacFile *f)
+{
+ return f->qidoffset;
+}
+
ulong
vacfilegetmcount(VacFile *f)
{
@@ -402,6 +409,7 @@
filefree(ff);
goto Err;
}
+fprint(2, "offset %s %lld\n", ff->dir.elem, ff->dir.qidoffset);
ff->qidoffset = f->qidoffset + ff->dir.qidoffset;
vtfileunlock(meta);
vtblockput(b);
diff --git a/src/cmd/vac/vac.c b/src/cmd/vac/vac.c
index 6716aa1..e97951b 100644
--- a/src/cmd/vac/vac.c
+++ b/src/cmd/vac/vac.c
@@ -586,7 +586,9 @@
d->qidoffset = offset;
d->qidmax = max;
}
- if(vacfilesetdir(f, d) < 0 || vacfilesetentries(f, &ed, &em) < 0){
+ if(vacfilesetdir(f, d) < 0
+ || vacfilesetentries(f, &ed, &em) < 0
+ || vacfilesetqidspace(f, d->qidoffset, d->qidmax) < 0){
warn("vacmergefile %s: %r", d->elem);
vacfiledecref(mf);
vacfiledecref(f);
diff --git a/src/cmd/vac/vac.h b/src/cmd/vac/vac.h
index 610028f..0b82d0e 100644
--- a/src/cmd/vac/vac.h
+++ b/src/cmd/vac/vac.h
@@ -135,6 +135,7 @@
void vdcleanup(VacDir *dir);
void vdcopy(VacDir *dst, VacDir *src);
int vacfilesetqidspace(VacFile*, u64int, u64int);
+uvlong vacfilegetqidoffset(VacFile*);
VacDirEnum *vdeopen(VacFile*);
int vderead(VacDirEnum*, VacDir *);
diff --git a/src/cmd/vac/vacfs.c b/src/cmd/vac/vacfs.c
index 5ec17ae..5c65cf3 100644
--- a/src/cmd/vac/vacfs.c
+++ b/src/cmd/vac/vacfs.c
@@ -637,14 +637,11 @@
char *ext = nil;
#endif
- USED(parent);
-
memset(&dir, 0, sizeof(dir));
- /*
- * Where do path and version come from
- */
- dir.qid.path = vd->qid;
+ dir.qid.path = vd->qid + vacfilegetqidoffset(parent);
+ if(vd->qidspace)
+ dir.qid.path += vd->qidoffset;
dir.qid.vers = vd->mcount;
dir.mode = vd->mode & 0777;
if(vd->mode & ModeAppend){
