Merge branch 'scale' of ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into scale

Conflicts: bonsai.c

Merge branch 'scale' of ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into scale
7f49b2ed · Frans Kaashoek · a5bd126f · 23c30d87 · 7f49b2ed · 7f49b2ed
--- a/bonsai.c
+++ b/bonsai.c
@@ -44,7 +44,6 @@ alloc_node(struct kv *kv, node_t *l, node_t *r)
 static void
 free_node(void *p)
 {
-  // printf("free_node: 0x%lx\n", (long) n);
  kmfree(p);
 }

--- a/sysfile.c
+++ b/sysfile.c
@@ -285,11 +285,14 @@ sys_open(void)
    if((ip = create(path, T_FILE, 0, 0)) == 0)
      return -1;
  } else {
+ retry:
    if((ip = namei(path)) == 0)
      return -1;
    ilock(ip, 0);
-    if(ip->type == 0)
+    if(ip->type == 0) {
-      panic("open");
+      iunlockput(ip);
+      goto retry;
+    }
    if(ip->type == T_DIR) {
      if (omode != O_RDONLY){
 	iunlockput(ip);