devfs: dont raise "no more trees" if malloc fails
This commit is contained in:
parent
1238374df9
commit
bef3c5a3c5
|
@ -250,7 +250,7 @@ treealloc(char *name)
|
||||||
return nil;
|
return nil;
|
||||||
t = trees[i] = mallocz(sizeof(Tree), 1);
|
t = trees[i] = mallocz(sizeof(Tree), 1);
|
||||||
if(t == nil)
|
if(t == nil)
|
||||||
return nil;
|
error(Enomem);
|
||||||
if(i == ntrees)
|
if(i == ntrees)
|
||||||
ntrees++;
|
ntrees++;
|
||||||
kstrdup(&t->name, name);
|
kstrdup(&t->name, name);
|
||||||
|
@ -675,10 +675,11 @@ Fail:
|
||||||
t = lookuptree(tname);
|
t = lookuptree(tname);
|
||||||
if(t != nil)
|
if(t != nil)
|
||||||
validdevname(t, dname);
|
validdevname(t, dname);
|
||||||
else
|
else{
|
||||||
t = treealloc(tname);
|
t = treealloc(tname);
|
||||||
if(t == nil)
|
if(t == nil)
|
||||||
error("no more trees");
|
error("no more trees");
|
||||||
|
}
|
||||||
mp = devalloc(t, dname);
|
mp = devalloc(t, dname);
|
||||||
if(mp == nil){
|
if(mp == nil){
|
||||||
if(t->ndevs == 0) /* it was created for us */
|
if(t->ndevs == 0) /* it was created for us */
|
||||||
|
|
Loading…
Reference in a new issue