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

simplify

Browse source
This commit is contained in:
rsc 2009-05-31 02:07:51 +00:00
parent 7f399ccaa4
commit f3685aa391
3 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
file.h
View file

@ -1,5 +1,5 @@
struct file { struct file {
enum { FD_CLOSED, FD_NONE, FD_PIPE, FD_INODE } type; enum { FD_NONE, FD_PIPE, FD_INODE } type;
int ref; // reference count int ref; // reference count
char readable; char readable;
char writable; char writable;

8
pipe.c
View file

@ -47,14 +47,10 @@ pipealloc(struct file **f0, struct file **f1)
bad: bad:
if(p) if(p)
kfree((char*)p, PAGE); kfree((char*)p, PAGE);
if(*f0){ if(*f0)
(*f0)->type = FD_NONE;
fileclose(*f0); fileclose(*f0);
} if(*f1)
if(*f1){
(*f1)->type = FD_NONE;
fileclose(*f1); fileclose(*f1);
}
return -1; return -1;
} }

37
sysfile.c
View file

@ -127,17 +127,17 @@ sys_link(void)
iunlock(ip); iunlock(ip);
if((dp = nameiparent(new, name)) == 0) if((dp = nameiparent(new, name)) == 0)
goto bad;
ilock(dp);
if(dp->dev != ip->dev || dirlink(dp, name, ip->inum) < 0)
goto bad; goto bad;
ilock(dp);
if(dp->dev != ip->dev || dirlink(dp, name, ip->inum) < 0){
iunlockput(dp);
goto bad;
}
iunlockput(dp); iunlockput(dp);
iput(ip); iput(ip);
return 0; return 0;
bad: bad:
if(dp)
iunlockput(dp);
ilock(ip); ilock(ip);
ip->nlink--; ip->nlink--;
iupdate(ip); iupdate(ip);
@ -212,7 +212,7 @@ sys_unlink(void)
} }
static struct inode* static struct inode*
create(char *path, int canexist, short type, short major, short minor) create(char *path, short type, short major, short minor)
{ {
uint off; uint off;
struct inode *ip, *dp; struct inode *ip, *dp;
@ -222,10 +222,10 @@ create(char *path, int canexist, short type, short major, short minor)
return 0; return 0;
ilock(dp); ilock(dp);
if(canexist && (ip = dirlookup(dp, name, &off)) != 0){ if((ip = dirlookup(dp, name, &off)) != 0){
iunlockput(dp); iunlockput(dp);
ilock(ip); ilock(ip);
if(ip->type != type || ip->major != major || ip->minor != minor){ if(ip->type != type || type != T_FILE){
iunlockput(ip); iunlockput(ip);
return 0; return 0;
} }
@ -250,17 +250,8 @@ create(char *path, int canexist, short type, short major, short minor)
panic("create dots"); panic("create dots");
} }
if(dirlink(dp, name, ip->inum) < 0){ if(dirlink(dp, name, ip->inum) < 0)
if(type == T_DIR){ panic("create: dirlink");
dp->nlink--;
iupdate(dp);
}
iunlockput(dp);
ip->nlink = 0;
iunlockput(ip);
return 0;
}
iunlockput(dp); iunlockput(dp);
return ip; return ip;
@ -278,13 +269,13 @@ sys_open(void)
return -1; return -1;
if(omode & O_CREATE){ if(omode & O_CREATE){
if((ip = create(path, 1, T_FILE, 0, 0)) == 0) if((ip = create(path, T_FILE, 0, 0)) == 0)
return -1; return -1;
} else { } else {
if((ip = namei(path)) == 0) if((ip = namei(path)) == 0)
return -1; return -1;
ilock(ip); ilock(ip);
if(ip->type == T_DIR && (omode & (O_RDWR|O_WRONLY))){ if(ip->type == T_DIR && omode != O_RDONLY){
iunlockput(ip); iunlockput(ip);
return -1; return -1;
} }
@ -318,7 +309,7 @@ sys_mknod(void)
if((len=argstr(0, &path)) < 0 || if((len=argstr(0, &path)) < 0 ||
argint(1, &major) < 0 || argint(1, &major) < 0 ||
argint(2, &minor) < 0 || argint(2, &minor) < 0 ||
(ip = create(path, 0, T_DEV, major, minor)) == 0) (ip = create(path, T_DEV, major, minor)) == 0)
return -1; return -1;
iunlockput(ip); iunlockput(ip);
return 0; return 0;
@ -330,7 +321,7 @@ sys_mkdir(void)
char *path; char *path;
struct inode *ip; struct inode *ip;
if(argstr(0, &path) < 0 || (ip = create(path, 0, T_DIR, 0, 0)) == 0) if(argstr(0, &path) < 0 || (ip = create(path, T_DIR, 0, 0)) == 0)
return -1; return -1;
iunlockput(ip); iunlockput(ip);
return 0; return 0;