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

diff --git a/sys/src/cmd/upas/fs/cache.c b/sys/src/cmd/upas/fs/cache.c
index 5382d08b0e2351085fd9498bc8ed2669880ad30e..34c4a2e866a91067aef0dd4b1d34bdd4b271fd81 100644 (file)
--- a/sys/src/cmd/upas/fs/cache.c
+++ b/sys/src/cmd/upas/fs/cache.c
@@ -32,13 +32,11 @@ notecache(Mailbox *mb, Message *m, long sz)
 }
 
 void
-cachefree(Mailbox *mb, Message *m, int force)
+cachefree(Mailbox *mb, Message *m)
 {
        long i;
        Message *s, **ll;
 
-       if(!force && mb->fetch == nil)
-               return;
        if(Topmsg(mb, m)){
                for(ll = &mb->lru; *ll != nil; ll = &((*ll)->lru)){
                        if(*ll == m){
@@ -53,7 +51,7 @@ cachefree(Mailbox *mb, Message *m, int force)
                mb->cached -= m->csize;
        }
        for(s = m->part; s; s = s->next)
-               cachefree(mb, s, force);
+               cachefree(mb, s);
        if(m->mallocd){
                free(m->start);
                m->mallocd = 0;
@@ -100,7 +98,7 @@ putcache(Mailbox *mb, Message *m)
                                return;
                        addlru(mb, mb->lru);
                }
-               cachefree(mb, mb->lru, 1);
+               cachefree(mb, mb->lru);
        }
 }
 

diff --git a/sys/src/cmd/upas/fs/dat.h b/sys/src/cmd/upas/fs/dat.h
index 67f11bb982496e24e540694a6662c5adde0c5c70..d25656b0c01060619e585b032a7c6143ad13624c 100644 (file)
--- a/sys/src/cmd/upas/fs/dat.h
+++ b/sys/src/cmd/upas/fs/dat.h
@@ -207,7 +207,7 @@ int         insurecache(Mailbox*, Message*);
 
 /**/
 void           putcache(Mailbox*, Message*);           /* asymmetricial */
-void           cachefree(Mailbox*, Message*, int);
+void           cachefree(Mailbox*, Message*);
 
 char*          syncmbox(Mailbox*, int);
 void*          emalloc(ulong);

diff --git a/sys/src/cmd/upas/fs/mbox.c b/sys/src/cmd/upas/fs/mbox.c
index 044c4b09178b0b224e545ba394012376dd2cc85d..b83014ec00ff89094fee82256c9f70c0db79ebf2 100644 (file)
--- a/sys/src/cmd/upas/fs/mbox.c
+++ b/sys/src/cmd/upas/fs/mbox.c
@@ -1041,7 +1041,7 @@ delmessage(Mailbox *mb, Message *m)
 
                if(Topmsg(mb, m))
                        mtreedelete(mb, m);
-               cachefree(mb, m, 1);
+               cachefree(mb, m);
                idxfree(m);
        }
        free(m->unixfrom);