aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Tomas <alex@clusterfs.com>2007-05-24 13:04:25 -0400
committerTheodore Ts'o <tytso@mit.edu>2007-05-31 16:20:15 -0400
commit315054f023d28ee64f308adf8b5737831541776b (patch)
tree09d40287fdde6f6e46ad578f9810e30933c7594c
parent25d14f983f70ddbeb15fa2d0f32f6b70bca42a15 (diff)
downloadkernel_samsung_aries-315054f023d28ee64f308adf8b5737831541776b.zip
kernel_samsung_aries-315054f023d28ee64f308adf8b5737831541776b.tar.gz
kernel_samsung_aries-315054f023d28ee64f308adf8b5737831541776b.tar.bz2
When ext4_ext_insert_extent() fails to insert new blocks
we should free just the allocated blocks. Signed-off-by: Alex Tomas <alex@clusterfs.com> Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ext4/extents.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 03c777a..b9ce241 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -2099,8 +2099,12 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode,
ext4_ext_store_pblock(&newex, newblock);
newex.ee_len = cpu_to_le16(allocated);
err = ext4_ext_insert_extent(handle, inode, path, &newex);
- if (err)
+ if (err) {
+ /* free data blocks we just allocated */
+ ext4_free_blocks(handle, inode, ext_pblock(&newex),
+ le16_to_cpu(newex.ee_len));
goto out2;
+ }
if (extend_disksize && inode->i_size > EXT4_I(inode)->i_disksize)
EXT4_I(inode)->i_disksize = inode->i_size;