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

wdir now uses readi/writei

Browse source
This commit is contained in:
rtm 2006-08-13 20:06:42 +00:00
parent 17e3cf15ba
commit e4bcd2a3a9
2 changed files with 12 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
fs.c
View file

@ -450,43 +450,24 @@ void
wdir(struct inode *dp, char *name, uint ino)
{
uint off;
struct buf *bp = 0;
struct dirent *ep = 0;
struct dirent de;
int i;
int lb;
if(dp->size % BSIZE)
dp->size += (BSIZE - dp->size % BSIZE);
for(off = 0; off < dp->size; off += sizeof(de)){
if(readi(dp, (char *) &de, off, sizeof(de)) != sizeof(de))
panic("wdir read");
if(de.inum == 0)
break;
}
for(off = 0; off < dp->size; off += BSIZE) {
bp = bread(dp->dev, bmap(dp, off / BSIZE));
for(ep = (struct dirent *) bp->data;
ep < (struct dirent *) (bp->data + BSIZE);
ep++){
if(ep->inum == 0)
goto found;
}
brelse(bp);
}
lb = dp->size / BSIZE;
if (lb >= NDIRECT) {
panic ("wdir: too many entries");
}
dp->addrs[lb] = balloc(dp->dev);
bp = bread(dp->dev, dp->addrs[lb]);
memset(bp->data, 0, BSIZE);
ep = (struct dirent *) (bp->data);
dp->size += BSIZE;
found:
ep->inum = ino;
de.inum = ino;
for(i = 0; i < DIRSIZ && name[i]; i++)
ep->name[i] = name[i];
de.name[i] = name[i];
for( ; i < DIRSIZ; i++)
ep->name[i] = '\0';
bwrite (bp, bmap(dp, off/BSIZE)); // write directory block
brelse(bp);
iupdate(dp);
de.name[i] = '\0';
if(writei(dp, (char *) &de, off, sizeof(de)) != sizeof(de))
panic("wdir write");
}
struct inode *

1
picirq.c
View file

@ -17,7 +17,6 @@ static ushort irq_mask_8259A = 0xFFFF & ~(1<<IRQ_SLAVE);
static void
irq_setmask_8259A(ushort mask)
{
int i;
irq_mask_8259A = mask;
outb(IO_PIC1+1, (char)mask);