diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:49:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-22 23:49:01 +0000 |
| commit | d221c44b7afefd8f77f8595af468dfacb3b21cc2 (patch) | |
| tree | ef1c7aa4fe157c9f63be777cc6809f292da1f5d5 /fs/ext2 | |
| parent | 51d3b7814cdccef9188240fe0cbd8d97ff2c7470 (diff) | |
Merge with Linux 2.3.8.
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/truncate.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/ext2/truncate.c b/fs/ext2/truncate.c index 75ffaa534..b6f57efb0 100644 --- a/fs/ext2/truncate.c +++ b/fs/ext2/truncate.c @@ -158,7 +158,7 @@ out: } #define DATA_BUFFER_USED(bh) \ - ((bh->b_count > 1) || buffer_locked(bh)) + (bh->b_count || buffer_locked(bh)) static int trunc_direct (struct inode * inode) { @@ -177,12 +177,11 @@ static int trunc_direct (struct inode * inode) bh = find_buffer(inode->i_dev, tmp, inode->i_sb->s_blocksize); if (bh) { - bh->b_count++; if (DATA_BUFFER_USED(bh)) { - brelse(bh); retry = 1; continue; } + bh->b_count++; } *p = 0; @@ -254,12 +253,11 @@ static int trunc_indirect (struct inode * inode, int offset, u32 * p, */ bh = find_buffer(inode->i_dev, tmp, inode->i_sb->s_blocksize); if (bh) { - bh->b_count++; if (DATA_BUFFER_USED(bh)) { - brelse(bh); retry = 1; continue; } + bh->b_count++; } *ind = 0; |