summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2018-06-03 23:33:35 +0200
committercinap_lenrek <cinap_lenrek@felloff.net>2018-06-03 23:33:35 +0200
commit56ffc907ac25b28e3640a2d1ef5b61df90f0b700 (patch)
tree4e185e8c2de6ce9e9bb15776881cdd8150b29210
parent8c70c09bfdfb5857e60e2455642603a883847c14 (diff)
downloadplan9front-56ffc907ac25b28e3640a2d1ef5b61df90f0b700.tar.xz
kernel: stop the practice of passing DMDIR to devir() perm argument
devdir internally replicates the qid in ther perm stat field already and the practice of explicitely passing just causing confusion when done inconsistently.
-rw-r--r--sys/src/9/port/dev.c2
-rw-r--r--sys/src/9/port/devdup.c2
-rw-r--r--sys/src/9/port/devfs.c12
-rw-r--r--sys/src/9/port/devpipe.c4
-rw-r--r--sys/src/9/port/devproc.c2
-rw-r--r--sys/src/9/port/devsegment.c6
-rw-r--r--sys/src/9/port/devusb.c2
-rw-r--r--sys/src/9/port/netif.c6
8 files changed, 18 insertions, 18 deletions
diff --git a/sys/src/9/port/dev.c b/sys/src/9/port/dev.c
index 464aedc48..e875c50e4 100644
--- a/sys/src/9/port/dev.c
+++ b/sys/src/9/port/dev.c
@@ -277,7 +277,7 @@ devstat(Chan *c, uchar *db, int n, Dirtab *tab, int ntab, Devgen *gen)
for(elem=p=c->path->s; *p; p++)
if(*p == '/')
elem = p+1;
- devdir(c, c->qid, elem, 0, eve, DMDIR|0555, &dir);
+ devdir(c, c->qid, elem, 0, eve, 0555, &dir);
n = convD2M(&dir, db, n);
if(n == 0)
error(Ebadarg);
diff --git a/sys/src/9/port/devdup.c b/sys/src/9/port/devdup.c
index cdc380324..2ba718729 100644
--- a/sys/src/9/port/devdup.c
+++ b/sys/src/9/port/devdup.c
@@ -17,7 +17,7 @@ dupgen(Chan *c, char *, Dirtab*, int, int s, Dir *dp)
Qid q;
if(s == DEVDOTDOT){
- devdir(c, c->qid, ".", 0, eve, DMDIR|0555, dp);
+ devdir(c, c->qid, ".", 0, eve, 0555, dp);
return 1;
}
if(s == 0)
diff --git a/sys/src/9/port/devfs.c b/sys/src/9/port/devfs.c
index e5d1abe2f..8efc07e37 100644
--- a/sys/src/9/port/devfs.c
+++ b/sys/src/9/port/devfs.c
@@ -811,7 +811,7 @@ mgen(Chan *c, char*, Dirtab*, int, int i, Dir *dp)
qid.vers = 0;
if(c->qid.path == Qtop){
if(i == DEVDOTDOT){
- devdir(c, tqid, "#k", 0, eve, DMDIR|0775, dp);
+ devdir(c, tqid, "#k", 0, eve, 0775, dp);
return 1;
}
t = gettree(i, Optional);
@@ -820,7 +820,7 @@ mgen(Chan *c, char*, Dirtab*, int, int i, Dir *dp)
return -1;
}
qid.path = mkpath(i, Qdir);
- devdir(c, qid, t->name, 0, eve, DMDIR|0775, dp);
+ devdir(c, qid, t->name, 0, eve, 0775, dp);
return 1;
}
@@ -832,7 +832,7 @@ mgen(Chan *c, char*, Dirtab*, int, int i, Dir *dp)
}
if((c->qid.type & QTDIR) != 0){
if(i == DEVDOTDOT){
- devdir(c, tqid, "#k", 0, eve, DMDIR|0775, dp);
+ devdir(c, tqid, "#k", 0, eve, 0775, dp);
return 1;
}
if(treeno == 0){
@@ -857,7 +857,7 @@ mgen(Chan *c, char*, Dirtab*, int, int i, Dir *dp)
if(i == DEVDOTDOT){
qid.path = mkpath(treeno, Qdir);
- devdir(c, qid, t->name, 0, eve, DMDIR|0775, dp);
+ devdir(c, qid, t->name, 0, eve, 0775, dp);
return 1;
}
dprint("no\n");
@@ -909,7 +909,7 @@ mstat(Chan *c, uchar *db, int n)
memset(&d, 0, sizeof d);
switch(p){
case Qtop:
- devdir(c, tqid, "#k", 0, eve, DMDIR|0775, &d);
+ devdir(c, tqid, "#k", 0, eve, 0775, &d);
break;
case Qctl:
devdir(c, cqid, "ctl", 0, eve, 0664, &d);
@@ -917,7 +917,7 @@ mstat(Chan *c, uchar *db, int n)
default:
t = gettree(path2treeno(p), Mustexist);
if(c->qid.type & QTDIR)
- devdir(c, c->qid, t->name, 0, eve, DMDIR|0775, &d);
+ devdir(c, c->qid, t->name, 0, eve, 0775, &d);
else{
mp = getdev(t, path2devno(p) - Qfirst, Mustexist);
q = c->qid;
diff --git a/sys/src/9/port/devpipe.c b/sys/src/9/port/devpipe.c
index 5660c24ae..40491efa0 100644
--- a/sys/src/9/port/devpipe.c
+++ b/sys/src/9/port/devpipe.c
@@ -102,7 +102,7 @@ pipegen(Chan *c, char*, Dirtab *tab, int ntab, int i, Dir *dp)
Pipe *p;
if(i == DEVDOTDOT){
- devdir(c, c->qid, "#|", 0, eve, DMDIR|0555, dp);
+ devdir(c, c->qid, "#|", 0, eve, 0555, dp);
return 1;
}
i++; /* skip . */
@@ -165,7 +165,7 @@ pipestat(Chan *c, uchar *db, int n)
switch(NETTYPE(c->qid.path)){
case Qdir:
- devdir(c, c->qid, ".", 0, eve, DMDIR|0555, &dir);
+ devdir(c, c->qid, ".", 0, eve, 0555, &dir);
break;
case Qdata0:
devdir(c, c->qid, "data", qlen(p->q[0]), eve, p->perm, &dir);
diff --git a/sys/src/9/port/devproc.c b/sys/src/9/port/devproc.c
index f3761cb17..d54fcb507 100644
--- a/sys/src/9/port/devproc.c
+++ b/sys/src/9/port/devproc.c
@@ -231,7 +231,7 @@ procgen(Chan *c, char *name, Dirtab *tab, int, int s, Dir *dp)
if(name != nil && strcmp(name, up->genbuf) != 0)
return -1;
mkqid(&qid, (s+1)<<QSHIFT, pid, QTDIR);
- devdir(c, qid, up->genbuf, 0, p->user, DMDIR|0555, dp);
+ devdir(c, qid, up->genbuf, 0, p->user, 0555, dp);
return 1;
}
if(c->qid.path == Qtrace){
diff --git a/sys/src/9/port/devsegment.c b/sys/src/9/port/devsegment.c
index 7cd80fc2e..fcaf8f3e4 100644
--- a/sys/src/9/port/devsegment.c
+++ b/sys/src/9/port/devsegment.c
@@ -87,7 +87,7 @@ segmentgen(Chan *c, char*, Dirtab*, int, int s, Dir *dp)
q.vers = 0;
q.path = PATH(0, Qtopdir);
q.type = QTDIR;
- devdir(c, q, "#g", 0, eve, DMDIR|0777, dp);
+ devdir(c, q, "#g", 0, eve, 0777, dp);
break;
}
@@ -104,7 +104,7 @@ segmentgen(Chan *c, char*, Dirtab*, int, int s, Dir *dp)
q.path = PATH(s, Qsegdir);
q.type = QTDIR;
kstrcpy(up->genbuf, g->name, sizeof up->genbuf);
- devdir(c, q, up->genbuf, 0, g->uid, DMDIR|0777, dp);
+ devdir(c, q, up->genbuf, 0, g->uid, 0777, dp);
unlock(&globalseglock);
break;
case Qsegdir:
@@ -112,7 +112,7 @@ segmentgen(Chan *c, char*, Dirtab*, int, int s, Dir *dp)
q.vers = 0;
q.path = PATH(0, Qtopdir);
q.type = QTDIR;
- devdir(c, q, "#g", 0, eve, DMDIR|0777, dp);
+ devdir(c, q, "#g", 0, eve, 0777, dp);
break;
}
/* fall through */
diff --git a/sys/src/9/port/devusb.c b/sys/src/9/port/devusb.c
index 580c45e87..846ed32ab 100644
--- a/sys/src/9/port/devusb.c
+++ b/sys/src/9/port/devusb.c
@@ -629,7 +629,7 @@ usbgen(Chan *c, char *, Dirtab*, int, int s, Dir *dp)
mkqid(&q, Qep0dir+4*s, 0, QTDIR);
putep(ep);
poperror();
- devdir(c, q, up->genbuf, 0, eve, 0755, dp);
+ devdir(c, q, up->genbuf, 0, eve, 0775, dp);
if(0)ddprint("ok\n");
return 1;
diff --git a/sys/src/9/port/netif.c b/sys/src/9/port/netif.c
index 48bcdd405..19e4dd9b3 100644
--- a/sys/src/9/port/netif.c
+++ b/sys/src/9/port/netif.c
@@ -72,7 +72,7 @@ netifgen(Chan *c, char*, Dirtab *vp, int, int i, Dir *dp)
case DEVDOTDOT:
q.type = QTDIR;
q.path = 0;
- devdir(c, q, ".", 0, eve, DMDIR|0555, dp);
+ devdir(c, q, ".", 0, eve, 0555, dp);
break;
case 0:
q.path = Ncloneqid;
@@ -99,7 +99,7 @@ netifgen(Chan *c, char*, Dirtab *vp, int, int i, Dir *dp)
q.type = QTDIR;
q.path = NETQID(i, N3rdqid);
snprint(up->genbuf, sizeof up->genbuf, "%d", i);
- devdir(c, q, up->genbuf, 0, eve, DMDIR|0555, dp);
+ devdir(c, q, up->genbuf, 0, eve, 0555, dp);
break;
}
return 1;
@@ -121,7 +121,7 @@ netifgen(Chan *c, char*, Dirtab *vp, int, int i, Dir *dp)
q.type = QTDIR;
q.path = N2ndqid;
strcpy(up->genbuf, nif->name);
- devdir(c, q, up->genbuf, 0, eve, DMDIR|0555, dp);
+ devdir(c, q, up->genbuf, 0, eve, 0555, dp);
break;
case 0:
q.path = NETQID(NETID(c->qid.path), Ndataqid);