summaryrefslogtreecommitdiff
path: root/fs.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2017-08-08 13:24:38 -0400
committerRobert Morris <[email protected]>2017-08-08 13:24:38 -0400
commit9cec455b17984431af5d652758743f36f810c37f (patch)
treeef7f9e45df7d21caab4d55e3a53c12263b21e7ab /fs.c
parent5cbccef811ce0347370723c0b931e108c306279e (diff)
downloadxv6-labs-9cec455b17984431af5d652758743f36f810c37f.tar.gz
xv6-labs-9cec455b17984431af5d652758743f36f810c37f.tar.bz2
xv6-labs-9cec455b17984431af5d652758743f36f810c37f.zip
fs comment nits
Diffstat (limited to 'fs.c')
-rw-r--r--fs.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs.c b/fs.c
index f27ae6f..a0634e4 100644
--- a/fs.c
+++ b/fs.c
@@ -112,20 +112,20 @@ bfree(int dev, uint b)
// inodes include book-keeping information that is
// not stored on disk: ip->ref and ip->flags.
//
-// An inode and its in-memory represtative go through a
+// An inode and its in-memory representation go through a
// sequence of states before they can be used by the
// rest of the file system code.
//
// * Allocation: an inode is allocated if its type (on disk)
-// is non-zero. ialloc() allocates, iput() frees if
-// the link count has fallen to zero.
+// is non-zero. ialloc() allocates, and iput() frees if
+// the reference and link counts have fallen to zero.
//
// * Referencing in cache: an entry in the inode cache
// is free if ip->ref is zero. Otherwise ip->ref tracks
// the number of in-memory pointers to the entry (open
-// files and current directories). iget() to find or
-// create a cache entry and increment its ref, iput()
-// to decrement ref.
+// files and current directories). iget() finds or
+// creates a cache entry and increments its ref; iput()
+// decrements ref.
//
// * Valid: the information (type, size, &c) in an inode
// cache entry is only correct when the I_VALID bit
@@ -283,7 +283,7 @@ ilock(struct inode *ip)
acquiresleep(&ip->lock);
- if(!(ip->flags & I_VALID)){
+ if((ip->flags & I_VALID) == 0){
bp = bread(ip->dev, IBLOCK(ip->inum, sb));
dip = (struct dinode*)bp->data + ip->inum%IPB;
ip->type = dip->type;