kernel: avoid selecting the boot process in killbig()

[plan9front.git] / sys / src / 9 / port / devaoe.c

diff --git a/sys/src/9/port/devaoe.c b/sys/src/9/port/devaoe.c
index 0512f701686566347f0e6d977700cad9d5322009..ed091df0a7d36735b48a58c51a510b3c82850bc8 100644 (file)
--- a/sys/src/9/port/devaoe.c
+++ b/sys/src/9/port/devaoe.c
@@ -12,7 +12,7 @@
 #include "ureg.h"
 #include "../port/error.h"
 #include "../port/netif.h"
-#include "etherif.h"
+#include "../port/etherif.h"
 #include "../ip/ip.h"
 #include "../port/aoe.h"
 #include <fis.h>
@@ -309,7 +309,7 @@ srbcleanout(Aoedev *d, Srb *srb)
        if(srb == d->inprocess)
                d->inprocess = nil;
        else
-               for(ll = &d->head; x = *ll; ll = &x->next){
+               for(ll = &d->head; (x = *ll) != nil; ll = &x->next){
                        d->tail = x;
                        if(x == srb)
                                *ll = x->next;
@@ -334,7 +334,7 @@ frameerror(Aoedev *d, Frame *f, char *s)
        srb = f->srb;
        f->srb = nil;
        f->tag = Tfree;         /* don't get fooled by way-slow responses */
-       if(!srb)
+       if(srb == nil)
                return;
        srb->nout--;
        srberror(d, srb, s);
@@ -375,15 +375,15 @@ eventlogread(void *a, long n)
 
                /* the concern here is page faults in memmove below */
                if(waserror()){
-                       free(buf);
                        qunlock(&events);
+                       free(buf);
                        nexterror();
                }
                memmove(a, buf, n);
                poperror();
        }
-       free(buf);
        qunlock(&events);
+       free(buf);
        return n;
 }
 
@@ -502,16 +502,16 @@ pickdevlink(Aoedev *d)
        for(i = 0; i < d->ndl; i++){
                n = d->dlidx++ % d->ndl;
                l = d->dl + n;
-               if(l && l->flag & Dup)
+               if(l->flag & Dup)
                        return l;
        }
-       return 0;
+       return nil;
 }
 
 static int
 pickea(Devlink *l)
 {
-       if(l == 0)
+       if(l == nil)
                return -1;
        if(l->nea == 0)
                return -1;
@@ -530,7 +530,7 @@ hset(Aoedev *d, Frame *f, Aoehdr *h, int cmd, int new)
        int i;
        Devlink *l;
 
-       if(f->srb)
+       if(f->srb != nil)
        if((long)(Ticks-f->srb->ticksent) > Srbtimeout){
                eventlog("%æ: srb timeout\n", d);
                if(cmd == ACata && Nofail(d, s))
@@ -542,7 +542,7 @@ hset(Aoedev *d, Frame *f, Aoehdr *h, int cmd, int new)
        l = pickdevlink(d);
        i = pickea(l);
        if(i == -1){
-               if(!(cmd == ACata && f->srb && Nofail(d, s)))
+               if(!(cmd == ACata && f->srb != nil && Nofail(d, s)))
                        downdev(d, "resend fails; no netlink/ea");
                return -1;
        }
@@ -653,7 +653,7 @@ loop:
        }
        starttick = Ticks;
        rlock(&devs);
-       for(d = devs.d; d; d = d->next){
+       for(d = devs.d; d != nil; d = d->next){
                if(!canqlock(d))
                        continue;
                if(!UP(d)){
@@ -701,8 +701,10 @@ loop:
        }
        runlock(&devs);
        i = Nms - TK2MS(Ticks - starttick);
-       if(i > 0)
+       if(i > 0 && !waserror()){
                tsleep(&up->sleep, return0, 0, i);
+               poperror();
+       }
        goto loop;
 }
 
@@ -788,7 +790,7 @@ unitseq(Chan *c, uint unit, Dir *dp)
        i = 0;
        rv = -1;
        rlock(&devs);
-       for(d = devs.d; d; d = d->next)
+       for(d = devs.d; d != nil; d = d->next)
                if(i++ == unit){
                        mkqid(&q, QID(d->unit, Qunitdir), 0, QTDIR);
                        devdir(c, q, unitname(d), 0, eve, 0555, dp);
@@ -805,7 +807,7 @@ unit2dev(ulong unit)
        Aoedev *d;
 
        rlock(&devs);
-       for(d = devs.d; d; d = d->next)
+       for(d = devs.d; d != nil; d = d->next)
                if(d->unit == unit){
                        runlock(&devs);
                        return d;
@@ -826,7 +828,7 @@ unitgen(Chan *c, ulong type, Dir *dp)
        Qid q;
 
        d = unit2dev(UNIT(c->qid));
-       perm = 0644;
+       perm = 0664;
        size = 0;
        vers = d->vers;
        t = QTFILE;
@@ -839,7 +841,7 @@ unitgen(Chan *c, ulong type, Dir *dp)
                break;
        case Qdata:
                p = "data";
-               perm = 0640;
+               perm = 0660;
                if(UP(d))
                        size = d->bsize;
                break;
@@ -879,7 +881,7 @@ topgen(Chan *c, ulong type, Dir *d)
                return -1;
        case Qtopctl:
                p = "ctl";
-               perm = 0644;
+               perm = 0664;
                break;
        case Qtoplog:
                p = "log";
@@ -947,24 +949,24 @@ aoegen(Chan *c, char *, Dirtab *, int, int s, Dir *dp)
                return unitgen(c, TYPE(c->qid), dp);
        case Qdevlinkdir:
                i = UNIT(c->qid);
+               if(i >= Maxunits || i >= units.ref)
+                       return -1;
+               d = unit2dev(i);
                if(s == DEVDOTDOT){
                        mkqid(&q, QID(i, Qunitdir), 0, QTDIR);
-                       devdir(c, q, "devlink", 0, eve, 0555, dp);
+                       devdir(c, q, unitname(d), 0, eve, 0555, dp);
                        return 1;
                }
-               if(i >= units.ref)
-                       return -1;
-               d = unit2dev(i);
                if(s >= d->ndl)
                        return -1;
                uprint("%d", s);
                mkqid(&q, Q3(s, i, Qdevlink), 0, QTFILE);
-               devdir(c, q, up->genbuf, 0, eve, 0755, dp);
+               devdir(c, q, up->genbuf, 0, eve, 0444, dp);
                return 1;
        case Qdevlink:
                uprint("%d", s);
                mkqid(&q, Q3(s, UNIT(c->qid), Qdevlink), 0, QTFILE);
-               devdir(c, q, up->genbuf, 0, eve, 0755, dp);
+               devdir(c, q, up->genbuf, 0, eve, 0444, dp);
                return 1;
        }
 }
@@ -1100,9 +1102,9 @@ aoeerror(Aoehdr *h)
        };
 
        if((h->verflag & AFerr) == 0)
-               return 0;
+               return nil;
        n = h->error;
-       if(n > nelem(errs))
+       if(n >= nelem(errs))
                n = 0;
        return errs[n];
 }
@@ -1180,7 +1182,7 @@ strategy(Aoedev *d, Srb *srb)
        if(!UP(d))
                error(Eio);
        srb->next = nil;
-       if(d->tail)
+       if(d->tail != nil)
                d->tail->next = srb;
        d->tail = srb;
        if(d->head == nil)
@@ -1236,7 +1238,7 @@ rw(Aoedev *d, int write, uchar *db, long len, uvlong off)
                if(write && !copy)
                        memmove(srb->data, db, n);
                strategy(d, srb);
-               if(srb->error)
+               if(srb->error != nil)
                        error(srb->error);
                if(!write && !copy)
                        memmove(db, srb->data, n);
@@ -1407,7 +1409,7 @@ topctlread(Chan *, void *db, int len, int off)
 
        for(i = 0; i < Nnetlink; i++){
                n = netlinks.nl+i;
-               if(n->cc == 0)
+               if(n->cc == nil)
                        continue;
                p = seprint(p, e, "if%d path: %s\n", i, n->path);
                p = seprint(p, e, "if%d ea: %E\n", i, n->ea);
@@ -1705,7 +1707,7 @@ addnet(char *path, Chan *cc, Chan *dc, Chan *mtu, uchar *ea)
        }
        nl = netlinks.nl;
        e = nl + nelem(netlinks.nl);
-       for(; nl < e && nl->cc; nl++)
+       for(; nl < e && nl->cc != nil; nl++)
                continue;
        if(nl == e)
                error("out of netlink structures");
@@ -1726,24 +1728,18 @@ newunit(void)
 {
        int x;
 
-       lock(&units);
-       if(units.ref == Maxunits)
+       x = incref(&units)-1;
+       if(x >= Maxunits){
+               decref(&units);
                x = -1;
-       else
-               x = units.ref++;
-       unlock(&units);
+       }
        return x;
 }
 
 static int
 dropunit(void)
 {
-       int x;
-
-       lock(&units);
-       x = --units.ref;
-       unlock(&units);
-       return x;
+       return decref(&units);
 }
 
 /*
@@ -1974,7 +1970,7 @@ qcfgrsp(Block *b, Netlink *nl)
                srb = f->srb;
                f->dp = nil;
                f->srb = nil;
-               if(srb){
+               if(srb != nil){
                        srb->nout--;
                        srbwakeup(srb);
                        d->nout--;
@@ -2062,9 +2058,7 @@ aoeidentify(Aoedev *d, ushort *id)
 static void
 newvers(Aoedev *d)
 {
-       lock(&drivevers);
-       d->vers = drivevers.ref++;
-       unlock(&drivevers);
+       d->vers = incref(&drivevers);
 }
 
 static int
@@ -2139,7 +2133,7 @@ atarsp(Block *b)
        if(ahin->cmdstat & 0xa9){
                eventlog("%æ: ata error cmd %.2ux stat %.2ux\n",
                        d, ahout->cmdstat, ahin->cmdstat);
-               if(srb)
+               if(srb != nil)
                        srb->error = Eio;
        } else {
                n = ahout->scnt * Aoesectsz;
@@ -2147,7 +2141,7 @@ atarsp(Block *b)
                case Crd:
                case Crdext:
                        if(BLEN(b) - (Aoehsz + Aoeatasz) != n){
-                               eventlog("%æ: misread blen %ld expect %d\n",
+                               eventlog("%æ: misread blen %zd expect %d\n",
                                        d, BLEN(b), n);
                                goto bail;
                        }
@@ -2165,7 +2159,7 @@ atarsp(Block *b)
                        break;
                case Cid:
                        if(BLEN(b) - (Aoehsz + Aoeatasz) < 512){
-                               eventlog("%æ: runt identify blen %ld expect %d\n",
+                               eventlog("%æ: runt identify blen %zd expect %d\n",
                                        d, BLEN(b), 512 + Aoehsz + Aoeatasz);
                                goto bail;
                        }
@@ -2180,7 +2174,7 @@ atarsp(Block *b)
        }
 
        f->srb = nil;
-       if(srb){
+       if(srb != nil){
                srb->nout--;
                srbwakeup(srb);
        }
@@ -2255,11 +2249,9 @@ getaddr(char *path, uchar *ea)
                cclose(c);
                nexterror();
        }
-       if(c == nil)
-               panic("æ: getaddr: c == nil");
        n = devtab[c->type]->read(c, buf, sizeof buf-1, 0);
-       poperror();
        cclose(c);
+       poperror();
        buf[n] = 0;
        if(parseether(ea, buf) < 0)
                error("parseether failure");
@@ -2276,21 +2268,19 @@ netbind(char *path)
        snprint(addr, sizeof addr, "%s!0x%x", path, Aoetype);
        dc = chandial(addr, nil, nil, &cc);
        snprint(addr, sizeof addr, "%s/mtu", path);
-       if(waserror())
-               mtu = nil;
-       else {
+       mtu = nil;
+       if(!waserror()){
                mtu = namec(addr, Aopen, OREAD, 0);
                poperror();
        }
-
        if(waserror()){
                cclose(dc);
                cclose(cc);
-               if(mtu)
+               if(mtu != nil)
                        cclose(mtu);
                nexterror();
        }
-       if(dc == nil  || cc == nil)
+       if(dc == nil || cc == nil)
                error(Enonexist);
        getaddr(path, ea);
        nl = addnet(path, cc, dc, mtu, ea);
@@ -2352,7 +2342,7 @@ netunbind(char *path)
 
        /* reschedule packets. */
        wlock(&devs);
-       for(d = devs.d; d; d = d->next){
+       for(d = devs.d; d != nil; d = d->next){
                qlock(d);
                for(i = 0; i < d->nframes; i++){
                        f = d->frames + i;
@@ -2365,7 +2355,7 @@ netunbind(char *path)
 
        /* squeeze devlink pool.  (we assert nobody is using them now) */
        wlock(&devs);
-       for(d = devs.d; d; d = d->next){
+       for(d = devs.d; d != nil; d = d->next){
                qlock(d);
                for(i = 0; i < d->ndl; i++){
                        l = d->dl + i;
@@ -2380,7 +2370,7 @@ netunbind(char *path)
        lock(&netlinks);
        dc = n->dc;
        cc = n->cc;
-       if(n->mtu)
+       if(n->mtu != nil)
                cclose(n->mtu);
        memset(n, 0, sizeof *n);
        unlock(&netlinks);
@@ -2390,7 +2380,7 @@ netunbind(char *path)
 
        /* squeeze orphan devices */
        wlock(&devs);
-       for(p = d = devs.d; d; d = next){
+       for(p = d = devs.d; d != nil; d = next){
                next = d->next;
                if(d->ndl > 0){
                        p = d;
@@ -2419,7 +2409,7 @@ strtoss(char *f, uint *shelf, uint *slot)
 
        *shelf = 0xffff;
        *slot = 0xff;
-       if(!f)
+       if(f == nil)
                return;
        *shelf = strtol(f, &s, 0);
        if(s == f || *shelf > 0xffff)
@@ -2450,7 +2440,7 @@ removedev(Aoedev *d)
        wlock(&devs);
        p = 0;
        if(d != devs.d)
-       for(p = devs.d; p; p = p->next)
+       for(p = devs.d; p != nil; p = p->next)
                if(p->next == d)
                        break;
        qlock(d);
@@ -2461,7 +2451,7 @@ removedev(Aoedev *d)
        for(i = 0; i < d->nframes; i++)
                frameerror(d, d->frames+i, Enotup);
 
-       if(p)
+       if(p != nil)
                p->next = d->next;
        else
                devs.d = d->next;
@@ -2500,7 +2490,7 @@ removestr(char *f)
 
        strtoss(f, &shelf, &slot);
        wlock(&devs);
-       for(d = devs.d; d; d = d->next)
+       for(d = devs.d; d != nil; d = d->next)
                if(shelf == d->major && slot == d->minor){
                        wunlock(&devs); /* BOTCH */
                        removedev(d);