summaryrefslogtreecommitdiff
path: root/kernel/defs.h
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2019-08-18 14:35:11 -0400
committerFrans Kaashoek <[email protected]>2019-08-18 14:35:11 -0400
commit2501560cd691fcdb9c310dccc14ac4e7486c99d9 (patch)
tree2bbda111baaeda8c4b8363422b8e9f39910177e6 /kernel/defs.h
parenta9953236cc9f1befb625575671bc39f1ab254bf0 (diff)
downloadxv6-labs-2501560cd691fcdb9c310dccc14ac4e7486c99d9.tar.gz
xv6-labs-2501560cd691fcdb9c310dccc14ac4e7486c99d9.tar.bz2
xv6-labs-2501560cd691fcdb9c310dccc14ac4e7486c99d9.zip
Cosmetic cleanup: fsinit reads sb and calls loginit. initialize icache
in main.c and don't make it disk specific; the icache is shared. This doesn't matter since we have only one disk, but conceptually cleaner and maybe helpful to students for mount lab.
Diffstat (limited to 'kernel/defs.h')
-rw-r--r--kernel/defs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/defs.h b/kernel/defs.h
index 2689bed..23dcd41 100644
--- a/kernel/defs.h
+++ b/kernel/defs.h
@@ -35,12 +35,12 @@ int filestat(struct file*, uint64 addr);
int filewrite(struct file*, uint64, int n);
// fs.c
-void readsb(int dev, struct superblock *sb);
+void fsinit(int);
int dirlink(struct inode*, char*, uint);
struct inode* dirlookup(struct inode*, char*, uint*);
struct inode* ialloc(uint, short);
struct inode* idup(struct inode*);
-void iinit(int dev);
+void iinit();
void ilock(struct inode*);
void iput(struct inode*);
void iunlock(struct inode*);
@@ -64,7 +64,7 @@ void kfree(void *);
void kinit();
// log.c
-void initlog(int dev);
+void initlog(int, struct superblock*);
void log_write(struct buf*);
void begin_op();
void end_op();