diff options
Diffstat (limited to 'fs/ext3/resize.c')
-rw-r--r-- | fs/ext3/resize.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c index 54351ac7cef9..e746d30b1232 100644 --- a/fs/ext3/resize.c +++ b/fs/ext3/resize.c | |||
@@ -964,7 +964,6 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, | |||
964 | ext3_fsblk_t n_blocks_count) | 964 | ext3_fsblk_t n_blocks_count) |
965 | { | 965 | { |
966 | ext3_fsblk_t o_blocks_count; | 966 | ext3_fsblk_t o_blocks_count; |
967 | unsigned long o_groups_count; | ||
968 | ext3_grpblk_t last; | 967 | ext3_grpblk_t last; |
969 | ext3_grpblk_t add; | 968 | ext3_grpblk_t add; |
970 | struct buffer_head * bh; | 969 | struct buffer_head * bh; |
@@ -976,10 +975,10 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, | |||
976 | * yet: we're going to revalidate es->s_blocks_count after | 975 | * yet: we're going to revalidate es->s_blocks_count after |
977 | * taking the s_resize_lock below. */ | 976 | * taking the s_resize_lock below. */ |
978 | o_blocks_count = le32_to_cpu(es->s_blocks_count); | 977 | o_blocks_count = le32_to_cpu(es->s_blocks_count); |
979 | o_groups_count = EXT3_SB(sb)->s_groups_count; | ||
980 | 978 | ||
981 | if (test_opt(sb, DEBUG)) | 979 | if (test_opt(sb, DEBUG)) |
982 | printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK" uto "E3FSBLK" blocks\n", | 980 | printk(KERN_DEBUG "EXT3-fs: extending last group from "E3FSBLK |
981 | " upto "E3FSBLK" blocks\n", | ||
983 | o_blocks_count, n_blocks_count); | 982 | o_blocks_count, n_blocks_count); |
984 | 983 | ||
985 | if (n_blocks_count == 0 || n_blocks_count == o_blocks_count) | 984 | if (n_blocks_count == 0 || n_blocks_count == o_blocks_count) |
@@ -987,7 +986,7 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, | |||
987 | 986 | ||
988 | if (n_blocks_count > (sector_t)(~0ULL) >> (sb->s_blocksize_bits - 9)) { | 987 | if (n_blocks_count > (sector_t)(~0ULL) >> (sb->s_blocksize_bits - 9)) { |
989 | printk(KERN_ERR "EXT3-fs: filesystem on %s:" | 988 | printk(KERN_ERR "EXT3-fs: filesystem on %s:" |
990 | " too large to resize to %lu blocks safely\n", | 989 | " too large to resize to "E3FSBLK" blocks safely\n", |
991 | sb->s_id, n_blocks_count); | 990 | sb->s_id, n_blocks_count); |
992 | if (sizeof(sector_t) < 8) | 991 | if (sizeof(sector_t) < 8) |
993 | ext3_warning(sb, __func__, | 992 | ext3_warning(sb, __func__, |
@@ -1067,11 +1066,11 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es, | |||
1067 | es->s_blocks_count = cpu_to_le32(o_blocks_count + add); | 1066 | es->s_blocks_count = cpu_to_le32(o_blocks_count + add); |
1068 | ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh); | 1067 | ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh); |
1069 | mutex_unlock(&EXT3_SB(sb)->s_resize_lock); | 1068 | mutex_unlock(&EXT3_SB(sb)->s_resize_lock); |
1070 | ext3_debug("freeing blocks %lu through "E3FSBLK"\n", o_blocks_count, | 1069 | ext3_debug("freeing blocks "E3FSBLK" through "E3FSBLK"\n", |
1071 | o_blocks_count + add); | 1070 | o_blocks_count, o_blocks_count + add); |
1072 | ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks); | 1071 | ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks); |
1073 | ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n", o_blocks_count, | 1072 | ext3_debug("freed blocks "E3FSBLK" through "E3FSBLK"\n", |
1074 | o_blocks_count + add); | 1073 | o_blocks_count, o_blocks_count + add); |
1075 | if ((err = ext3_journal_stop(handle))) | 1074 | if ((err = ext3_journal_stop(handle))) |
1076 | goto exit_put; | 1075 | goto exit_put; |
1077 | if (test_opt(sb, DEBUG)) | 1076 | if (test_opt(sb, DEBUG)) |