summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--console.c3
-rw-r--r--fs.c10
-rw-r--r--fs.h7
3 files changed, 13 insertions, 7 deletions
diff --git a/console.c b/console.c
index d84c7ff..fa611ef 100644
--- a/console.c
+++ b/console.c
@@ -195,7 +195,8 @@ consoleintr(int (*getc)(void))
while((c = getc()) >= 0){
switch(c){
case C('P'): // Process listing.
- doprocdump = 1; // procdump() locks cons.lock indirectly; invoke later
+ // procdump() locks cons.lock indirectly; invoke later
+ doprocdump = 1;
break;
case C('U'): // Kill line.
while(input.e != input.w &&
diff --git a/fs.c b/fs.c
index f800b77..6887dbc 100644
--- a/fs.c
+++ b/fs.c
@@ -22,7 +22,9 @@
#define min(a, b) ((a) < (b) ? (a) : (b))
static void itrunc(struct inode*);
-struct superblock sb; // there should be one per dev, but we run with one dev
+// there should be one superblock per disk device, but we run with
+// only one device
+struct superblock sb;
// Read the super block.
void
@@ -164,8 +166,10 @@ iinit(int dev)
{
initlock(&icache.lock, "icache");
readsb(dev, &sb);
- cprintf("sb: size %d nblocks %d ninodes %d nlog %d logstart %d inodestart %d bmap start %d\n", sb.size,
- sb.nblocks, sb.ninodes, sb.nlog, sb.logstart, sb.inodestart, sb.bmapstart);
+ cprintf("sb: size %d nblocks %d ninodes %d nlog %d logstart %d\
+ inodestart %d bmap start %d\n", sb.size, sb.nblocks,
+ sb.ninodes, sb.nlog, sb.logstart, sb.inodestart,
+ sb.bmapstart);
}
static struct inode* iget(uint dev, uint inum);
diff --git a/fs.h b/fs.h
index e64ecc0..3214f1d 100644
--- a/fs.h
+++ b/fs.h
@@ -6,10 +6,11 @@
#define BSIZE 512 // block size
// Disk layout:
-// [ boot block | super block | log | inode blocks | free bit map | data blocks ]
+// [ boot block | super block | log | inode blocks |
+// free bit map | data blocks]
//
-// mkfs computes the super block and builds an initial file system. The super describes
-// the disk layout:
+// mkfs computes the super block and builds an initial file system. The
+// super block describes the disk layout:
struct superblock {
uint size; // Size of file system image (blocks)
uint nblocks; // Number of data blocks