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

upas/fs: remove now unnecessary "force" argument to cachefree

Browse source
This commit is contained in:
Alex Musolino 2018-12-13 11:59:34 +10:30
parent 9b194f23b2
commit b830824cba
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sys/src/cmd/upas/fs/cache.c
View file

@ -32,13 +32,11 @@ notecache(Mailbox *mb, Message *m, long sz)
} }
void void
cachefree(Mailbox *mb, Message *m, int force) cachefree(Mailbox *mb, Message *m)
{ {
long i; long i;
Message *s, **ll; Message *s, **ll;
if(!force && mb->fetch == nil)
return;
if(Topmsg(mb, m)){ if(Topmsg(mb, m)){
for(ll = &mb->lru; *ll != nil; ll = &((*ll)->lru)){ for(ll = &mb->lru; *ll != nil; ll = &((*ll)->lru)){
if(*ll == m){ if(*ll == m){
@ -53,7 +51,7 @@ cachefree(Mailbox *mb, Message *m, int force)
mb->cached -= m->csize; mb->cached -= m->csize;
} }
for(s = m->part; s; s = s->next) for(s = m->part; s; s = s->next)
cachefree(mb, s, force); cachefree(mb, s);
if(m->mallocd){ if(m->mallocd){
free(m->start); free(m->start);
m->mallocd = 0; m->mallocd = 0;
@ -100,7 +98,7 @@ putcache(Mailbox *mb, Message *m)
return; return;
addlru(mb, mb->lru); addlru(mb, mb->lru);
} }
cachefree(mb, mb->lru, 1); cachefree(mb, mb->lru);
} }
} }

2
sys/src/cmd/upas/fs/dat.h
View file

@ -207,7 +207,7 @@ int insurecache(Mailbox*, Message*);
/**/ /**/
void putcache(Mailbox*, Message*); /* asymmetricial */ void putcache(Mailbox*, Message*); /* asymmetricial */
void cachefree(Mailbox*, Message*, int); void cachefree(Mailbox*, Message*);
char* syncmbox(Mailbox*, int); char* syncmbox(Mailbox*, int);
void* emalloc(ulong); void* emalloc(ulong);

2
sys/src/cmd/upas/fs/mbox.c
View file

@ -1041,7 +1041,7 @@ delmessage(Mailbox *mb, Message *m)
if(Topmsg(mb, m)) if(Topmsg(mb, m))
mtreedelete(mb, m); mtreedelete(mb, m);
cachefree(mb, m, 1); cachefree(mb, m);
idxfree(m); idxfree(m);
} }
free(m->unixfrom); free(m->unixfrom);