summaryrefslogtreecommitdiff
path: root/defs.h
diff options
context:
space:
mode:
authorrsc <rsc>2007-08-24 20:54:23 +0000
committerrsc <rsc>2007-08-24 20:54:23 +0000
commit07090dd705df557cba5ce4ea46b2a274876343a5 (patch)
tree4e4c4415c702ff4c041e101ab3c7173fd636d9d0 /defs.h
parentfa1b34106ad99cf8021227b4c1e62353ae4d0fda (diff)
downloadxv6-labs-07090dd705df557cba5ce4ea46b2a274876343a5.tar.gz
xv6-labs-07090dd705df557cba5ce4ea46b2a274876343a5.tar.bz2
xv6-labs-07090dd705df557cba5ce4ea46b2a274876343a5.zip
Remove struct uinode.
Remove type arg to mknod (assume T_DEV).
Diffstat (limited to 'defs.h')
-rw-r--r--defs.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/defs.h b/defs.h
index ba70cbb..cbe0dd4 100644
--- a/defs.h
+++ b/defs.h
@@ -6,7 +6,6 @@ struct pipe;
struct proc;
struct spinlock;
struct stat;
-struct uinode;
// 8253pit.c
void pit8253_timerinit(void);
@@ -37,17 +36,18 @@ int filewrite(struct file*, char*, int n);
// fs.c
int dirlink(struct inode*, char*, uint);
-struct uinode* dirlookup(struct inode*, char*, uint*);
-struct uinode* ialloc(uint, short);
-struct uinode* idup(struct uinode*);
+struct inode* dirlookup(struct inode*, char*, uint*);
+struct inode* ialloc(uint, short);
+struct inode* idup(struct inode*);
void iinit(void);
-struct inode* ilock(struct uinode*);
-struct uinode* iunlock(struct inode*);
-void iput(struct uinode*);
+void ilock(struct inode*);
+void iput(struct inode*);
+void iunlock(struct inode*);
+void iunlockput(struct inode*);
void iupdate(struct inode*);
int namecmp(const char*, const char*);
-struct uinode* namei(char*);
-struct uinode* nameiparent(char*, char*);
+struct inode* namei(char*);
+struct inode* nameiparent(char*, char*);
int readi(struct inode*, char*, uint, uint);
void stati(struct inode*, struct stat*);
int writei(struct inode*, char*, uint, uint);