cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ramfs: update to work

Browse source 
ramfs: update to work

erealloc(p, 0) is handled correctly
removed fprint(2, ...
removed assert()
This commit is contained in:
fgergo 2023-12-30 14:58:44 +01:00 committed by GitHub
parent 3a877764da
commit f8681acb37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cmd/ramfs.c
View file

@ -368,13 +368,11 @@ rwalk(Fid *f)
} }
if(nf != nil && (err!=nil || rhdr.nwqid<thdr.nwname)){ if(nf != nil && (err!=nil || rhdr.nwqid<thdr.nwname)){
/* clunk the new fid, which is the one we walked */ /* clunk the new fid, which is the one we walked */
fprint(2, "f %d zero busy\n", f->fid);
f->busy = 0; f->busy = 0;
f->ram = nil; f->ram = nil;
} }
if(rhdr.nwqid == thdr.nwname) /* update the fid after a successful walk */ if(rhdr.nwqid == thdr.nwname) /* update the fid after a successful walk */
f->ram = fram; f->ram = fram;
assert(f->busy);
return err; return err;
} }
@ -615,8 +613,6 @@ rclunk(Fid *f)
f->ram->open--; f->ram->open--;
if(f->rclose) if(f->rclose)
e = realremove(f->ram); e = realremove(f->ram);
fprint(2, "clunk fid %d busy=%d\n", f->fid, f->busy);
fprint(2, "f %d zero busy\n", f->fid);
f->busy = 0; f->busy = 0;
f->open = 0; f->open = 0;
f->ram = 0; f->ram = 0;
@ -630,7 +626,6 @@ rremove(Fid *f)
if(f->open) if(f->open)
f->ram->open--; f->ram->open--;
fprint(2, "f %d zero busy\n", f->fid);
f->busy = 0; f->busy = 0;
f->open = 0; f->open = 0;
r = f->ram; r = f->ram;
@ -874,6 +869,10 @@ emalloc(ulong n)
void * void *
erealloc(void *p, ulong n) erealloc(void *p, ulong n)
{ {
if(n == 0) {
free(p);
return nil;
}
p = realloc(p, n); p = realloc(p, n);
if(!p) if(!p)
error("out of memory"); error("out of memory");