summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2017-08-09 14:16:55 -0400
committerRobert Morris <[email protected]>2017-08-09 14:16:55 -0400
commit6389d9d4103eaebdd4749cacf475014e525a1c9a (patch)
tree216b42f178039198374c3ee8c78629457ebd250a
parent4f14d8d1e594bdf45e36a035f6c3fd4ca959711e (diff)
downloadxv6-labs-6389d9d4103eaebdd4749cacf475014e525a1c9a.tar.gz
xv6-labs-6389d9d4103eaebdd4749cacf475014e525a1c9a.tar.bz2
xv6-labs-6389d9d4103eaebdd4749cacf475014e525a1c9a.zip
nothing much
-rw-r--r--bio.c2
-rw-r--r--fs.c2
-rw-r--r--log.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/bio.c b/bio.c
index a61ff72..a45ff3e 100644
--- a/bio.c
+++ b/bio.c
@@ -99,7 +99,7 @@ bread(uint dev, uint blockno)
struct buf *b;
b = bget(dev, blockno);
- if(!(b->flags & B_VALID)) {
+ if((b->flags & B_VALID) == 0) {
iderw(b);
}
return b;
diff --git a/fs.c b/fs.c
index 8fb09ef..1ada466 100644
--- a/fs.c
+++ b/fs.c
@@ -190,7 +190,7 @@ static struct inode* iget(uint dev, uint inum);
//PAGEBREAK!
// Allocate an inode on device dev.
-// Give it type type.
+// Mark it as allocated by giving it type type.
// Returns an unlocked but allocated and referenced inode.
struct inode*
ialloc(uint dev, short type)
diff --git a/log.c b/log.c
index 9ba3ced..a64c0f6 100644
--- a/log.c
+++ b/log.c
@@ -155,7 +155,9 @@ end_op(void)
do_commit = 1;
log.committing = 1;
} else {
- // begin_op() may be waiting for log space.
+ // begin_op() may be waiting for log space,
+ // and decrementing log.outstanding has decreased
+ // the amount of reserved space.
wakeup(&log);
}
release(&log.lock);