diff options
author | rsc <rsc> | 2006-09-06 18:43:45 +0000 |
---|---|---|
committer | rsc <rsc> | 2006-09-06 18:43:45 +0000 |
commit | 50e514be986e4d5b136879d1221b721b17493a78 (patch) | |
tree | 02143f4bb428485d156c4671b35e31180aa5822c /pipe.c | |
parent | 9936bffa45c928ead9660a0df32d08a50b2b09c2 (diff) | |
download | xv6-labs-50e514be986e4d5b136879d1221b721b17493a78.tar.gz xv6-labs-50e514be986e4d5b136879d1221b721b17493a78.tar.bz2 xv6-labs-50e514be986e4d5b136879d1221b721b17493a78.zip |
fd_* => file_*
Diffstat (limited to 'pipe.c')
-rw-r--r-- | pipe.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -24,9 +24,9 @@ pipe_alloc(struct file **fd1, struct file **fd2) *fd1 = *fd2 = 0; struct pipe *p = 0; - if((*fd1 = fd_alloc()) == 0) + if((*fd1 = filealloc()) == 0) goto oops; - if((*fd2 = fd_alloc()) == 0) + if((*fd2 = filealloc()) == 0) goto oops; if((p = (struct pipe*) kalloc(PAGE)) == 0) goto oops; @@ -49,11 +49,11 @@ pipe_alloc(struct file **fd1, struct file **fd2) kfree((char*) p, PAGE); if(*fd1){ (*fd1)->type = FD_NONE; - fd_close(*fd1); + fileclose(*fd1); } if(*fd2){ (*fd2)->type = FD_NONE; - fd_close(*fd2); + fileclose(*fd2); } return -1; } |