diff options
author | rsc <rsc> | 2009-05-31 00:59:37 +0000 |
---|---|---|
committer | rsc <rsc> | 2009-05-31 00:59:37 +0000 |
commit | ba6cd8a685cdf86f308ba8c8cd1faa39adf86fa5 (patch) | |
tree | 4ba105d444cc4e0f541486879f76d354ddbd6aaf /fs.c | |
parent | 030a47736fbb0febddce2647e5a80b98ca409695 (diff) | |
download | xv6-labs-ba6cd8a685cdf86f308ba8c8cd1faa39adf86fa5.tar.gz xv6-labs-ba6cd8a685cdf86f308ba8c8cd1faa39adf86fa5.tar.bz2 xv6-labs-ba6cd8a685cdf86f308ba8c8cd1faa39adf86fa5.zip |
drop NADDRS and INDIRECT; too many names
Diffstat (limited to 'fs.c')
-rw-r--r-- | fs.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -335,10 +335,10 @@ bmap(struct inode *ip, uint bn, int alloc) if(bn < NINDIRECT){ // Load indirect block, allocating if necessary. - if((addr = ip->addrs[INDIRECT]) == 0){ + if((addr = ip->addrs[NDIRECT]) == 0){ if(!alloc) return -1; - ip->addrs[INDIRECT] = addr = balloc(ip->dev); + ip->addrs[NDIRECT] = addr = balloc(ip->dev); } bp = bread(ip->dev, addr); a = (uint*)bp->data; @@ -375,16 +375,16 @@ itrunc(struct inode *ip) } } - if(ip->addrs[INDIRECT]){ - bp = bread(ip->dev, ip->addrs[INDIRECT]); + if(ip->addrs[NDIRECT]){ + bp = bread(ip->dev, ip->addrs[NDIRECT]); a = (uint*)bp->data; for(j = 0; j < NINDIRECT; j++){ if(a[j]) bfree(ip->dev, a[j]); } brelse(bp); - bfree(ip->dev, ip->addrs[INDIRECT]); - ip->addrs[INDIRECT] = 0; + bfree(ip->dev, ip->addrs[NDIRECT]); + ip->addrs[NDIRECT] = 0; } ip->size = 0; |