9a39427183
getdent() introduced a bug as the qid check fails in the case when we walk to DUMPROOTQID, but get ROOTQID in the directory instead. newentry() getblk(..., GBCREATE) caused the whole directory to get dumped until it hit a free slot. we cannot do this because this changes the addresses of Dentries of files but doesnt update the loctree. this caused the bogus walks when we hit a different directory than we expected. what we do now is the following: newentry() was changed to never dump anything. it will just read the directory and return a the address of a free slot or create a new block having space for one. chancreat() then makes a loc in the loctree for the free slot, drops the dirent buffer and calls willmodify() on the new slot. this will dump the block containing the slot (and possible other slots) and updates the loctree to the new version. after that, chancreate() modifies the slot filling the Dentry. there should be no race, as newentry() skips slots that have a loc in the loctree. theres one case where newentry() can dump the block immidiately when it is called from dump. added new parameter for that and documented in the comment. createuserdir() was simplified by just calling chancreat(). to get arround the permission check, a new per channel flag CHFNOPERM was added.
138 lines
2.7 KiB
C
138 lines
2.7 KiB
C
#include <u.h>
|
|
#include <libc.h>
|
|
#include <thread.h>
|
|
#include "dat.h"
|
|
#include "fns.h"
|
|
|
|
#define GET8(x) {x = *p++;}
|
|
#define GET16(x) {x = *p++; x |= *p++ << 8;}
|
|
#define GET24(x) {x = *p++; x |= *p++ << 8; x |= *p++ << 16;}
|
|
#define GET32(x) {x = *p++; x |= *p++ << 8; x |= *p++ << 16; x |= *p++ << 24;}
|
|
#define GET64(x) \
|
|
{x = (uvlong) *p++; \
|
|
x |= (uvlong) *p++ << 8; \
|
|
x |= (uvlong) *p++ << 16; \
|
|
x |= (uvlong) *p++ << 24; \
|
|
x |= (uvlong) *p++ << 32; \
|
|
x |= (uvlong) *p++ << 40; \
|
|
x |= (uvlong) *p++ << 48; \
|
|
x |= (uvlong) *p++ << 56;}
|
|
#define GETS(x, n) {memcpy(x, p, n); p += n;}
|
|
|
|
#define PUT8(x) {*p++ = x;}
|
|
#define PUT16(x) {*p++ = x; *p++ = x >> 8;}
|
|
#define PUT24(x) {*p++ = x; *p++ = x >> 8; *p++ = x >> 16;}
|
|
#define PUT32(x) {*p++ = x; *p++ = x >> 8; *p++ = x >> 16; *p++ = x >> 24;}
|
|
#define PUT64(x) \
|
|
{*p++ = x; \
|
|
*p++ = x >> 8; \
|
|
*p++ = x >> 16; \
|
|
*p++ = x >> 24; \
|
|
*p++ = x >> 32; \
|
|
*p++ = x >> 40; \
|
|
*p++ = x >> 48; \
|
|
*p++ = x >> 56;}
|
|
#define PUTS(x, n) {memcpy(p, x, n); p += n;}
|
|
|
|
void
|
|
unpack(Buf *b, uchar *p)
|
|
{
|
|
Dentry *d;
|
|
int i;
|
|
|
|
switch(b->type = *p++){
|
|
default:
|
|
memcpy(b->data, p, RBLOCK);
|
|
break;
|
|
case TSUPERBLOCK:
|
|
GET32(b->sb.magic);
|
|
GET64(b->sb.size);
|
|
GET64(b->sb.fstart);
|
|
GET64(b->sb.fend);
|
|
GET64(b->sb.root);
|
|
GET64(b->sb.qidpath);
|
|
break;
|
|
case TDENTRY:
|
|
for(d = b->de; d < &b->de[DEPERBLK]; d++){
|
|
GETS(d->name, NAMELEN);
|
|
GET16(d->uid);
|
|
GET16(d->muid);
|
|
GET16(d->gid);
|
|
GET16(d->mode);
|
|
GET64(d->path);
|
|
GET32(d->vers);
|
|
GET8(d->type);
|
|
GET64(d->size);
|
|
for(i = 0; i < NDIRECT; i++)
|
|
GET64(d->db[i]);
|
|
for(i = 0; i < NINDIRECT; i++)
|
|
GET64(d->ib[i]);
|
|
GET64(d->atime);
|
|
GET64(d->mtime);
|
|
}
|
|
break;
|
|
case TINDIR:
|
|
for(i = 0; i < OFFPERBLK; i++)
|
|
GET64(b->offs[i]);
|
|
break;
|
|
case TREF:
|
|
for(i = 0; i < REFPERBLK; i++)
|
|
GET24(b->refs[i]);
|
|
break;
|
|
}
|
|
USED(p);
|
|
}
|
|
|
|
void
|
|
pack(Buf *b, uchar *p)
|
|
{
|
|
Dentry *d;
|
|
int i;
|
|
|
|
switch(*p++ = b->type){
|
|
case TRAW:
|
|
memcpy(p, b->data, RBLOCK);
|
|
break;
|
|
|
|
case TSUPERBLOCK:
|
|
PUT32(b->sb.magic);
|
|
PUT64(b->sb.size);
|
|
PUT64(b->sb.fstart);
|
|
PUT64(b->sb.fend);
|
|
PUT64(b->sb.root);
|
|
PUT64(b->sb.qidpath);
|
|
break;
|
|
case TDENTRY:
|
|
for(d = b->de; d < b->de + nelem(b->de); d++){
|
|
PUTS(d->name, NAMELEN);
|
|
PUT16(d->uid);
|
|
PUT16(d->muid);
|
|
PUT16(d->gid);
|
|
PUT16(d->mode);
|
|
PUT64(d->path);
|
|
PUT32(d->vers);
|
|
PUT8(d->type);
|
|
PUT64(d->size);
|
|
for(i = 0; i < NDIRECT; i++)
|
|
PUT64(d->db[i]);
|
|
for(i = 0; i < NINDIRECT; i++)
|
|
PUT64(d->ib[i]);
|
|
PUT64(d->atime);
|
|
PUT64(d->mtime);
|
|
}
|
|
break;
|
|
case TINDIR:
|
|
for(i = 0; i < OFFPERBLK; i++)
|
|
PUT64(b->offs[i]);
|
|
break;
|
|
case TREF:
|
|
for(i = 0; i < REFPERBLK; i++)
|
|
PUT24(b->refs[i]);
|
|
break;
|
|
default:
|
|
abort();
|
|
}
|
|
USED(p);
|
|
}
|
|
|