summaryrefslogtreecommitdiff
path: root/fs/ext3/resize.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-27 12:55:53 +0400
committerJeff Garzik <jeff@garzik.org>2006-04-27 12:55:53 +0400
commit7894eaf291238a62a565e9e9777483beeb00eeae (patch)
tree43c08830d2030d39d719f3f3d54a0e9b36554770 /fs/ext3/resize.c
parent9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (diff)
parentacc696d93dcf993dec123d69d599979e1456ffec (diff)
downloadlinux-7894eaf291238a62a565e9e9777483beeb00eeae.tar.xz
Merge branch 'upstream' into irq-pio
Diffstat (limited to 'fs/ext3/resize.c')
-rw-r--r--fs/ext3/resize.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext3/resize.c b/fs/ext3/resize.c
index c5ffa8523968..8aac5334680d 100644
--- 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);