greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Shorten sys_unlink a little; create now fits in column

Browse source
This commit is contained in:
Austin Clements 2011-09-02 15:20:27 -04:00
parent 9bb1e53df5
commit 4e015d81aa
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sysfile.c
View file

@ -188,26 +188,18 @@ sys_unlink(void)
ilock(dp); ilock(dp);
// Cannot unlink "." or "..". // 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); ilock(ip);
if(ip->nlink < 1) if(ip->nlink < 1)
panic("unlink: nlink < 1"); panic("unlink: nlink < 1");
if(ip->type == T_DIR && !isdirempty(ip)){ if(ip->type == T_DIR && !isdirempty(ip)){
iunlockput(ip); iunlockput(ip);
iunlockput(dp); goto bad;
commit_trans();
return -1;
} }
memset(&de, 0, sizeof(de)); memset(&de, 0, sizeof(de));
@ -226,6 +218,11 @@ sys_unlink(void)
commit_trans(); commit_trans();
return 0; return 0;
bad:
iunlockput(dp);
commit_trans();
return -1;
} }
static struct inode* static struct inode*