diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-23 16:25:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-23 16:25:31 -0800 |
| commit | 55fb78a3a80348d87b2e3d79f61f8a9252dd86f5 (patch) | |
| tree | 7f5ee9be42840f7c5a6045a481187e59679e41f6 | |
| parent | 08861c713c1314d5b7329a290b5d53ad711112c3 (diff) | |
| parent | 8a7411a24350bac141271755c66f40c56b0535ae (diff) | |
| download | blackbird-op-linux-55fb78a3a80348d87b2e3d79f61f8a9252dd86f5.tar.gz blackbird-op-linux-55fb78a3a80348d87b2e3d79f61f8a9252dd86f5.zip | |
Merge branch 'linus-hot-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'linus-hot-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix on-line resizing regression
| -rw-r--r-- | fs/ext4/resize.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index dc963929de65..981c8477adab 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -232,6 +232,8 @@ static int setup_new_group_blocks(struct super_block *sb, GFP_NOFS); if (err) goto exit_bh; + for (i = 0, bit = gdblocks + 1; i < reserved_gdb; i++, bit++) + ext4_set_bit(bit, bh->b_data); ext4_debug("mark block bitmap %#04llx (+%llu)\n", input->block_bitmap, input->block_bitmap - start); @@ -247,6 +249,9 @@ static int setup_new_group_blocks(struct super_block *sb, err = sb_issue_zeroout(sb, block, sbi->s_itb_per_group, GFP_NOFS); if (err) goto exit_bh; + for (i = 0, bit = input->inode_table - start; + i < sbi->s_itb_per_group; i++, bit++) + ext4_set_bit(bit, bh->b_data); if ((err = extend_or_restart_transaction(handle, 2, bh))) goto exit_bh; |
