summaryrefslogtreecommitdiffstats
path: root/fs/ext2
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-04-05 11:23:36 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-04-05 11:23:36 +0000
commit4318fbda2a7ee51caafdc4eb1f8028a3f0605142 (patch)
treecddb50a81d7d1a628cc400519162080c6d87868e /fs/ext2
parent36ea5120664550fae6d31f1c6f695e4f8975cb06 (diff)
o Merge with Linux 2.1.91.
o First round of bugfixes for the SC/MC CPUs. o FPU context switch fixes. o Lazy context switches. o Faster syscalls. o Removed dead code. o Shitloads of other things I forgot ...
Diffstat (limited to 'fs/ext2')
-rw-r--r--fs/ext2/truncate.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/ext2/truncate.c b/fs/ext2/truncate.c
index 3b168cd75..442518af3 100644
--- a/fs/ext2/truncate.c
+++ b/fs/ext2/truncate.c
@@ -181,7 +181,7 @@ repeat:
for (i = 0; i < addr_per_block; i++)
if (le32_to_cpu(*(ind++)))
break;
- if (i >= addr_per_block)
+ if (i >= addr_per_block) {
if (ind_bh->b_count != 1)
retry = 1;
else {
@@ -193,6 +193,7 @@ repeat:
bforget(ind_bh);
ind_bh = NULL;
}
+ }
if (IS_SYNC(inode) && ind_bh && buffer_dirty(ind_bh)) {
ll_rw_block (WRITE, 1, &ind_bh);
wait_on_buffer (ind_bh);
@@ -243,7 +244,7 @@ repeat:
for (i = 0; i < addr_per_block; i++)
if (le32_to_cpu(*(dind++)))
break;
- if (i >= addr_per_block)
+ if (i >= addr_per_block) {
if (dind_bh->b_count != 1)
retry = 1;
else {
@@ -255,6 +256,7 @@ repeat:
bforget(dind_bh);
dind_bh = 0;
}
+ }
if (IS_SYNC(inode) && dind_bh && buffer_dirty(dind_bh)) {
ll_rw_block (WRITE, 1, &dind_bh);
wait_on_buffer (dind_bh);
@@ -304,7 +306,7 @@ repeat:
for (i = 0; i < addr_per_block; i++)
if (le32_to_cpu(*(tind++)))
break;
- if (i >= addr_per_block)
+ if (i >= addr_per_block) {
if (tind_bh->b_count != 1)
retry = 1;
else {
@@ -316,6 +318,7 @@ repeat:
bforget(tind_bh);
tind_bh = 0;
}
+ }
if (IS_SYNC(inode) && tind_bh && buffer_dirty(tind_bh)) {
ll_rw_block (WRITE, 1, &tind_bh);
wait_on_buffer (tind_bh);