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

check blockno passed to idestart

Browse source
This commit is contained in:
Frans Kaashoek 2015-04-10 07:15:06 -04:00
parent c24ac5d763
commit 895af77fe6
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ide.c
View file

@ -48,7 +48,7 @@ void
ideinit(void) ideinit(void)
{ {
int i; int i;
initlock(&idelock, "ide"); initlock(&idelock, "ide");
picenable(IRQ_IDE); picenable(IRQ_IDE);
ioapicenable(IRQ_IDE, ncpu - 1); ioapicenable(IRQ_IDE, ncpu - 1);
@ -73,6 +73,8 @@ idestart(struct buf *b)
{ {
if(b == 0) if(b == 0)
panic("idestart"); panic("idestart");
if(b->blockno >= FSSIZE)
panic("incorrect blockno");
int sector_per_block = BSIZE/SECTOR_SIZE; int sector_per_block = BSIZE/SECTOR_SIZE;
int sector = b->blockno * sector_per_block; int sector = b->blockno * sector_per_block;

13
mkfs.c
View file

@ -13,13 +13,12 @@
#define static_assert(a, b) do { switch (0) case 0: case (a): ; } while (0) #define static_assert(a, b) do { switch (0) case 0: case (a): ; } while (0)
#define SIZE 1000
#define NINODES 200 #define NINODES 200
// Disk layout: // Disk layout:
// [ boot block | sb block | inode blocks | bit map | data blocks | log ] // [ boot block | sb block | inode blocks | bit map | data blocks | log ]
int nbitmap = SIZE/(BSIZE*8) + 1; int nbitmap = FSSIZE/(BSIZE*8) + 1;
int ninodeblocks = NINODES / IPB + 1; int ninodeblocks = NINODES / IPB + 1;
int nlog = LOGSIZE; int nlog = LOGSIZE;
int nmeta; // Number of meta blocks (inode, bitmap, and 2 extra) int nmeta; // Number of meta blocks (inode, bitmap, and 2 extra)
@ -90,18 +89,18 @@ main(int argc, char *argv[])
} }
nmeta = 2 + ninodeblocks + nbitmap; nmeta = 2 + ninodeblocks + nbitmap;
nblocks = SIZE - nlog - nmeta; nblocks = FSSIZE - nlog - nmeta;
sb.size = xint(SIZE); sb.size = xint(FSSIZE);
sb.nblocks = xint(nblocks); // so whole disk is size sectors sb.nblocks = xint(nblocks); // so whole disk is size sectors
sb.ninodes = xint(NINODES); sb.ninodes = xint(NINODES);
sb.nlog = xint(nlog); sb.nlog = xint(nlog);
printf("nmeta %d (boot, super, inode blocks %u, bitmap blocks %u) blocks %d log %u total %d\n", nmeta, ninodeblocks, nbitmap, nblocks, nlog, SIZE); printf("nmeta %d (boot, super, inode blocks %u, bitmap blocks %u) blocks %d log %u total %d\n", nmeta, ninodeblocks, nbitmap, nblocks, nlog, FSSIZE);
freeblock = nmeta; // the first free block that we can allocate freeblock = nmeta; // the first free block that we can allocate
for(i = 0; i < SIZE; i++) for(i = 0; i < FSSIZE; i++)
wsect(i, zeroes); wsect(i, zeroes);
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
@ -164,7 +163,6 @@ main(int argc, char *argv[])
void void
wsect(uint sec, void *buf) wsect(uint sec, void *buf)
{ {
printf("seek to %d\n", sec * BSIZE);
if(lseek(fsfd, sec * BSIZE, 0) != sec * BSIZE){ if(lseek(fsfd, sec * BSIZE, 0) != sec * BSIZE){
perror("lseek"); perror("lseek");
exit(1); exit(1);
@ -183,7 +181,6 @@ winode(uint inum, struct dinode *ip)
struct dinode *dip; struct dinode *dip;
bn = IBLOCK(inum); bn = IBLOCK(inum);
printf("winode %d\n", bn);
rsect(bn, buf); rsect(bn, buf);
dip = ((struct dinode*)buf) + (inum % IPB); dip = ((struct dinode*)buf) + (inum % IPB);
*dip = *ip; *dip = *ip;

1
param.h
View file

@ -10,4 +10,5 @@
#define MAXOPBLOCKS 10 // max # of blocks any FS op writes #define MAXOPBLOCKS 10 // max # of blocks any FS op writes
#define LOGSIZE (MAXOPBLOCKS*3) // max data blocks in on-disk log #define LOGSIZE (MAXOPBLOCKS*3) // max data blocks in on-disk log
#define NBUF (MAXOPBLOCKS*3) // size of disk block cache #define NBUF (MAXOPBLOCKS*3) // size of disk block cache
#define FSSIZE 1000 // size of file system in blocks