xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

exportfs: simplify freefile() code

Browse source 
remove impossible checks, rewrite as while loop.
This commit is contained in:
cinap_lenrek 2014-08-02 19:22:10 +02:00
parent b185d2fe5c
commit 5302e88796
1 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
sys/src/cmd/exportfs/exportfs.c
View file

@ -587,30 +587,25 @@ freefile(File *f)
{
File *parent, *child;
Loop:
f->ref--;
if(f->ref > 0)
return;
freecnt++;
if(f->ref < 0) abort();
DEBUG(DFD, "free %s\n", f->name);
/* delete from parent */
parent = f->parent;
if(parent->child == f)
parent->child = f->childlist;
else{
for(child=parent->child; child->childlist!=f; child=child->childlist)
if(child->childlist == nil)
fatal("bad child list");
child->childlist = f->childlist;
while(--f->ref == 0){
freecnt++;
DEBUG(DFD, "free %s\n", f->name);
/* delete from parent */
parent = f->parent;
if(parent->child == f)
parent->child = f->childlist;
else{
for(child = parent->child; child->childlist != f; child = child->childlist) {
if(child->childlist == nil)
fatal("bad child list");
}
child->childlist = f->childlist;
}
freeqid(f->qidt);
free(f->name);
free(f);
f = parent;
}
freeqid(f->qidt);
free(f->name);
f->name = nil;
free(f);
f = parent;
if(f != nil)
goto Loop;
}
File *
@ -744,8 +739,7 @@ freeqid(Qidtab *q)
ulong h;
Qidtab *l;
q->ref--;
if(q->ref > 0)
if(--q->ref)
return;
qfreecnt++;
h = qidhash(q->path);