diff options
| author | Frans Kaashoek <kaashoek@mit.edu> | 2019-08-19 13:35:47 -0400 | 
|---|---|---|
| committer | Frans Kaashoek <kaashoek@mit.edu> | 2019-08-19 13:35:47 -0400 | 
| commit | e10f797762aad6cd1c008926a00cf6dfa1636fd1 (patch) | |
| tree | d71b6fb433f1abfc3437160fd79b13173f9cbbc4 /kernel | |
| parent | 2501560cd691fcdb9c310dccc14ac4e7486c99d9 (diff) | |
| parent | 0581c37baf8950ae9602a1419498a800f9fade4f (diff) | |
| download | xv6-labs-e10f797762aad6cd1c008926a00cf6dfa1636fd1.tar.gz xv6-labs-e10f797762aad6cd1c008926a00cf6dfa1636fd1.tar.bz2 xv6-labs-e10f797762aad6cd1c008926a00cf6dfa1636fd1.zip | |
Merge remote-tracking branch 'origin/master' into riscv
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sysfile.c | 3 | 
1 files changed, 1 insertions, 2 deletions
| diff --git a/kernel/sysfile.c b/kernel/sysfile.c index 292fa27..23a9540 100644 --- a/kernel/sysfile.c +++ b/kernel/sysfile.c @@ -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)) | 
