Commit ac51d837 authored by Theodore Ts'o's avatar Theodore Ts'o

ext4: calculate journal credits correctly

This fixes a 2.6.27 regression which was introduced in commit a02908f1.

We weren't passing the chunk parameter down to the two subections,
ext4_indirect_trans_blocks() and ext4_ext_index_trans_blocks(), with
the result that massively overestimate the amount of credits needed by
ext4_da_writepages, especially in the non-extents case.  This causes
failures especially on /boot partitions, which tend to be small and
non-extent using since GRUB doesn't handle extents.

This patch fixes the bug reported by Joseph Fannin at:
http://bugzilla.kernel.org/show_bug.cgi?id=11964Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 14ce0cb4
...@@ -4580,9 +4580,10 @@ static int ext4_indirect_trans_blocks(struct inode *inode, int nrblocks, ...@@ -4580,9 +4580,10 @@ static int ext4_indirect_trans_blocks(struct inode *inode, int nrblocks,
static int ext4_index_trans_blocks(struct inode *inode, int nrblocks, int chunk) static int ext4_index_trans_blocks(struct inode *inode, int nrblocks, int chunk)
{ {
if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL)) if (!(EXT4_I(inode)->i_flags & EXT4_EXTENTS_FL))
return ext4_indirect_trans_blocks(inode, nrblocks, 0); return ext4_indirect_trans_blocks(inode, nrblocks, chunk);
return ext4_ext_index_trans_blocks(inode, nrblocks, 0); return ext4_ext_index_trans_blocks(inode, nrblocks, chunk);
} }
/* /*
* Account for index blocks, block groups bitmaps and block group * Account for index blocks, block groups bitmaps and block group
* descriptor blocks if modify datablocks and index blocks * descriptor blocks if modify datablocks and index blocks
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment