Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / fs / ext3 / resize.c

diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index 14f5f6ea3e7230fb2621a620a3639ff136f1996d..34b39e9a1e5a01588db869c02c85f2407d12221a 100644 (file)
--- a/fs/ext3/resize.c
+++ b/fs/ext3/resize.c
@@ -213,7 +213,7 @@ static int setup_new_group_blocks(struct super_block *sb,
                        goto exit_bh;
                }
                lock_buffer(bh);
-               memcpy(gdb->b_data, sbi->s_group_desc[i], bh->b_size);
+               memcpy(gdb->b_data, sbi->s_group_desc[i]->b_data, bh->b_size);
                set_buffer_uptodate(gdb);
                unlock_buffer(bh);
                ext3_journal_dirty_metadata(handle, gdb);