ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Merge remote-tracking branch 'origin/master' into riscv

Browse source
This commit is contained in:
Frans Kaashoek 2019-08-19 13:35:47 -04:00
parent 2501560cd6 0581c37baf
commit e10f797762
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kernel/sysfile.c
View file

@ -241,7 +241,6 @@ bad:
static struct inode* static struct inode*
create(char *path, short type, short major, short minor) create(char *path, short type, short major, short minor)
{ {
uint off;
struct inode *ip, *dp; struct inode *ip, *dp;
char name[DIRSIZ]; char name[DIRSIZ];
@ -249,7 +248,7 @@ create(char *path, short type, short major, short minor)
return 0; return 0;
ilock(dp); ilock(dp);
if((ip = dirlookup(dp, name, &off)) != 0){ if((ip = dirlookup(dp, name, 0)) != 0){
iunlockput(dp); iunlockput(dp);
ilock(ip); ilock(ip);
if(type == T_FILE && (ip->type == T_FILE || ip->type == T_DEVICE)) if(type == T_FILE && (ip->type == T_FILE || ip->type == T_DEVICE))