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

This commit is contained in:
Frans Kaashoek 2019-08-19 13:35:47 -04:00
commit e10f797762

View file

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