x

011b8409 · Nickolai Zeldovich · 6d8e14b0 · 011b8409 · 011b8409 · 011b8409
--- a/file.c
+++ b/file.c
@@ -27,9 +27,8 @@ filealloc(void)
 struct file*
 filedup(struct file *f)
 {
-  if(f->ref < 1)
+  if (__sync_fetch_and_add(&f->ref, 1) < 1)
    panic("filedup");
-  __sync_fetch_and_add(&f->ref, 1);
  return f;
 }


--- a/kalloc.c
+++ b/kalloc.c
@@ -270,8 +270,8 @@ kmalloc(uint nbytes)
    mtrace_label_register(mtrace_label_heap,
 			  r,
 			  nbytes,
-			  "kmalloc",
-			  sizeof("kmalloc"),
+			  "kmalloc'ed",
+			  sizeof("kmalloc'ed"),
 			  RET_EIP());
  return r;
 }
--- a/ns.c
+++ b/ns.c
@@ -126,6 +126,7 @@ ns_remove(struct ns *ns, int key, void *v)
      break;

    if (e->key == key && (e->val == v || v == 0)) {
+      // XXX annotate as locks for mtrace
      if (!__sync_bool_compare_and_swap(&e->next_lock, 0, 1))
 	goto retry;
      if (!__sync_bool_compare_and_swap(pelock, 0, 1)) {