diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2008-08-01 21:59:19 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2008-08-01 21:59:19 -0400 |
| commit | 34071da71a665d8c81e3b3467c9a2e7c56386fec (patch) | |
| tree | bf737db477d20e4f748eccfcf13a28e428a7e04b | |
| parent | bc965ab3f2b4b7bb898b11d61d25295c2053b8ac (diff) | |
| download | kernel_samsung_smdk4412-34071da71a665d8c81e3b3467c9a2e7c56386fec.zip kernel_samsung_smdk4412-34071da71a665d8c81e3b3467c9a2e7c56386fec.tar.gz kernel_samsung_smdk4412-34071da71a665d8c81e3b3467c9a2e7c56386fec.tar.bz2 | |
ext4: don't assume extents can't cross block groups when truncating
With the FLEX_BG layout, there is no reason why extents can't cross
block groups, so make the truncate code reserve enough credits so we
don't BUG if we come across such an extent.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| -rw-r--r-- | fs/ext4/extents.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index f554703..f7529e2 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -1910,9 +1910,13 @@ ext4_ext_rm_leaf(handle_t *handle, struct inode *inode, BUG_ON(b != ex_ee_block + ex_ee_len - 1); } - /* at present, extent can't cross block group: */ - /* leaf + bitmap + group desc + sb + inode */ - credits = 5; + /* + * 3 for leaf, sb, and inode plus 2 (bmap and group + * descriptor) for each block group; assume two block + * groups plus ex_ee_len/blocks_per_block_group for + * the worst case + */ + credits = 7 + 2*(ex_ee_len/EXT4_BLOCKS_PER_GROUP(inode->i_sb)); if (ex == EXT_FIRST_EXTENT(eh)) { correct_index = 1; credits += (ext_depth(inode)) + 1; |