ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Fix a few lines that runoff is complaining about that they are too long

Browse source
This commit is contained in:
Frans Kaashoek 2016-09-02 14:59:00 -04:00
parent 5f03799f84
commit b7fed77b7b
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
console.c
View file

@ -195,7 +195,8 @@ consoleintr(int (*getc)(void))
while((c = getc()) >= 0){ while((c = getc()) >= 0){
switch(c){ switch(c){
case C('P'): // Process listing. case C('P'): // Process listing.
doprocdump = 1; // procdump() locks cons.lock indirectly; invoke later // procdump() locks cons.lock indirectly; invoke later
doprocdump = 1;
break; break;
case C('U'): // Kill line. case C('U'): // Kill line.
while(input.e != input.w && while(input.e != input.w &&

10
fs.c
View file

@ -22,7 +22,9 @@
#define min(a, b) ((a) < (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b))
static void itrunc(struct inode*); 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. // Read the super block.
void void
@ -164,8 +166,10 @@ iinit(int dev)
{ {
initlock(&icache.lock, "icache"); initlock(&icache.lock, "icache");
readsb(dev, &sb); readsb(dev, &sb);
cprintf("sb: size %d nblocks %d ninodes %d nlog %d logstart %d inodestart %d bmap start %d\n", sb.size, cprintf("sb: size %d nblocks %d ninodes %d nlog %d logstart %d\
sb.nblocks, sb.ninodes, sb.nlog, sb.logstart, sb.inodestart, sb.bmapstart); 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); static struct inode* iget(uint dev, uint inum);

7
fs.h
View file

@ -6,10 +6,11 @@
#define BSIZE 512 // block size #define BSIZE 512 // block size
// Disk layout: // 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 // mkfs computes the super block and builds an initial file system. The
// the disk layout: // super block describes the disk layout:
struct superblock { struct superblock {
uint size; // Size of file system image (blocks) uint size; // Size of file system image (blocks)
uint nblocks; // Number of data blocks uint nblocks; // Number of data blocks