summaryrefslogtreecommitdiff
path: root/kernel/log.c
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/log.c
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/log.c')
-rw-r--r--kernel/log.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/log.c b/kernel/log.c
index 59984db..5e884bb 100644
--- a/kernel/log.c
+++ b/kernel/log.c
@@ -52,16 +52,14 @@ static void recover_from_log(void);
static void commit();
void
-initlog(int dev)
+initlog(int dev, struct superblock *sb)
{
if (sizeof(struct logheader) >= BSIZE)
panic("initlog: too big logheader");
- struct superblock sb;
initlock(&log.lock, "log");
- readsb(dev, &sb);
- log.start = sb.logstart;
- log.size = sb.nlog;
+ log.start = sb->logstart;
+ log.size = sb->nlog;
log.dev = dev;
recover_from_log();
}