summaryrefslogtreecommitdiff
path: root/fs.c
diff options
context:
space:
mode:
authorrsc <rsc>2006-09-06 17:04:06 +0000
committerrsc <rsc>2006-09-06 17:04:06 +0000
commita650c606fecc7e3938345e2bc52050a9ea725e7a (patch)
tree3bd2cfcd215f7ad4abdb087cdfe91f608c7f0801 /fs.c
parent45854caa93eecc3f80d34940b7cf6a400b640d69 (diff)
downloadxv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.tar.gz
xv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.tar.bz2
xv6-labs-a650c606fecc7e3938345e2bc52050a9ea725e7a.zip
spacing fixes: no tabs, 2-space indents (for rtm)
Diffstat (limited to 'fs.c')
-rw-r--r--fs.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/fs.c b/fs.c
index 576bcb7..6f42fdd 100644
--- a/fs.c
+++ b/fs.c
@@ -270,16 +270,16 @@ itrunc(struct inode *ip)
for (i = 0; i < NADDRS; i++) {
if (ip->addrs[i] != 0) {
if (i == INDIRECT) {
- inbp = bread(ip->dev, ip->addrs[INDIRECT]);
+ inbp = bread(ip->dev, ip->addrs[INDIRECT]);
uint *a = (uint *) inbp->data;
- for (j = 0; j < NINDIRECT; j++) {
- if (a[j] != 0) {
- bfree(ip->dev, a[j]);
- a[j] = 0;
- }
- }
- brelse(inbp);
- }
+ for (j = 0; j < NINDIRECT; j++) {
+ if (a[j] != 0) {
+ bfree(ip->dev, a[j]);
+ a[j] = 0;
+ }
+ }
+ brelse(inbp);
+ }
bfree(ip->dev, ip->addrs[i]);
ip->addrs[i] = 0;
}
@@ -411,8 +411,8 @@ writei(struct inode *ip, char *addr, uint off, uint n)
lbn = off / BSIZE;
if (lbn >= MAXFILE) return r;
if (newblock(ip, lbn) < 0) {
- cprintf("newblock failed\n");
- return r;
+ cprintf("newblock failed\n");
+ return r;
}
m = min(BSIZE - off % BSIZE, n-r);
bp = bread(ip->dev, bmap(ip, lbn));
@@ -424,8 +424,8 @@ writei(struct inode *ip, char *addr, uint off, uint n)
}
if (r > 0) {
if (off > ip->size) {
- if (ip->type == T_DIR) ip->size = ((off / BSIZE) + 1) * BSIZE;
- else ip->size = off;
+ if (ip->type == T_DIR) ip->size = ((off / BSIZE) + 1) * BSIZE;
+ else ip->size = off;
}
iupdate(ip);
}