Shorten sys_unlink a little; create now fits in column

4e015d81 · Austin Clements · 9bb1e53d · 4e015d81
--- a/sysfile.c
+++ b/sysfile.c
@@ -188,26 +188,18 @@ sys_unlink(void)
  ilock(dp);
  // Cannot unlink "." or "..".
-  if(namecmp(name, ".") == 0 || namecmp(name, "..") == 0){
+  if(namecmp(name, ".") == 0 || namecmp(name, "..") == 0)
-    iunlockput(dp);
+    goto bad;
-    commit_trans();
-    return -1;
-  }
-  if((ip = dirlookup(dp, name, &off)) == 0){
+  if((ip = dirlookup(dp, name, &off)) == 0)
-    iunlockput(dp);
+    goto bad;
-    commit_trans();
-    return -1;
-  }
  ilock(ip);
  if(ip->nlink < 1)
    panic("unlink: nlink < 1");
  if(ip->type == T_DIR && !isdirempty(ip)){
    iunlockput(ip);
-    iunlockput(dp);
+    goto bad;
-    commit_trans();
-    return -1;
  }
  memset(&de, 0, sizeof(de));
@@ -226,6 +218,11 @@ sys_unlink(void)
  commit_trans();
  return 0;
+bad:
+  iunlockput(dp);
+  commit_trans();
+  return -1;
 }
 static struct inode*