diff --git a/[refs] b/[refs] index 927d11b56e67..826b3fb0993c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac39849ddc19c0bbb39068497139ac45bccd4321 +refs/heads/master: 5b615287b37c32dc0c9dbeab13b19ac87828a5f7 diff --git a/trunk/fs/ext4/resize.c b/trunk/fs/ext4/resize.c index 0a7e914c495a..484e5699f848 100644 --- a/trunk/fs/ext4/resize.c +++ b/trunk/fs/ext4/resize.c @@ -199,10 +199,10 @@ static int setup_new_group_blocks(struct super_block *sb, brelse(gdb); goto exit_bh; } - lock_buffer(bh); - memcpy(gdb->b_data, sbi->s_group_desc[i]->b_data, bh->b_size); + lock_buffer(gdb); + memcpy(gdb->b_data, sbi->s_group_desc[i]->b_data, gdb->b_size); set_buffer_uptodate(gdb); - unlock_buffer(bh); + unlock_buffer(gdb); ext4_journal_dirty_metadata(handle, gdb); ext4_set_bit(bit, bh->b_data); brelse(gdb);