summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE2
-rw-r--r--fs.c2
-rw-r--r--vm.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index d4b5af9..4ec362c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
The xv6 software is:
-Copyright (c) 2006-2016 Frans Kaashoek, Robert Morris, Russ Cox,
+Copyright (c) 2006-2017 Frans Kaashoek, Robert Morris, Russ Cox,
Massachusetts Institute of Technology
Permission is hereby granted, free of charge, to any person obtaining
diff --git a/fs.c b/fs.c
index 2f0cf3b..36b07d2 100644
--- a/fs.c
+++ b/fs.c
@@ -518,7 +518,7 @@ dirlookup(struct inode *dp, char *name, uint *poff)
for(off = 0; off < dp->size; off += sizeof(de)){
if(readi(dp, (char*)&de, off, sizeof(de)) != sizeof(de))
- panic("dirlink read");
+ panic("dirlookup read");
if(de.inum == 0)
continue;
if(namecmp(name, de.name) == 0){
diff --git a/vm.c b/vm.c
index 9ac7401..42102a6 100644
--- a/vm.c
+++ b/vm.c
@@ -128,8 +128,10 @@ setupkvm(void)
panic("PHYSTOP too high");
for(k = kmap; k < &kmap[NELEM(kmap)]; k++)
if(mappages(pgdir, k->virt, k->phys_end - k->phys_start,
- (uint)k->phys_start, k->perm) < 0)
+ (uint)k->phys_start, k->perm) < 0) {
+ freevm(pgdir);
return 0;
+ }
return pgdir;
}