diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2013-07-15 00:09:19 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2013-07-15 00:09:19 -0400 |
| commit | 8acd5e9b1217e58a57124d9e225afa12efeae20d (patch) | |
| tree | 34464ff949e24f7361f6ed0d76637372a10e88e7 /fs/ext4 | |
| parent | e7676a704ee0a1ef71a6b23760b5a8f6896cb1a1 (diff) | |
| download | op-kernel-dev-8acd5e9b1217e58a57124d9e225afa12efeae20d.zip op-kernel-dev-8acd5e9b1217e58a57124d9e225afa12efeae20d.tar.gz | |
ext4: fix error handling in ext4_ext_truncate()
Previously ext4_ext_truncate() was ignoring potential error returns
from ext4_es_remove_extent() and ext4_ext_remove_space(). This can
lead to the on-diks extent tree and the extent status tree cache
getting out of sync, which is particuarlly bad, and can lead to file
system corruption and potential data loss.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/extents.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 7097b0f..f57cc0e 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4405,9 +4405,20 @@ void ext4_ext_truncate(handle_t *handle, struct inode *inode) last_block = (inode->i_size + sb->s_blocksize - 1) >> EXT4_BLOCK_SIZE_BITS(sb); +retry: err = ext4_es_remove_extent(inode, last_block, EXT_MAX_BLOCKS - last_block); + if (err == ENOMEM) { + cond_resched(); + congestion_wait(BLK_RW_ASYNC, HZ/50); + goto retry; + } + if (err) { + ext4_std_error(inode->i_sb, err); + return; + } err = ext4_ext_remove_space(inode, last_block, EXT_MAX_BLOCKS - 1); + ext4_std_error(inode->i_sb, err); } static void ext4_falloc_update_inode(struct inode *inode, |
