From 4ef28824ca29e86053398c3e4cecca6d88b2b397 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Thu, 28 Feb 2008 13:24:17 -0600 Subject: [PATCH] resize2fs: Fix movement of large (greater than 128 byte) inodes inode_scan_and_fix() in resize2fs needs to do read/write of the full inode to be sure it gets all data from larger (>128 byte) inodes. Addresses-Red-Hat-Bugzilla: #434893 Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" --- resize/resize2fs.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/resize/resize2fs.c b/resize/resize2fs.c index 473a74cf..dd26089f 100644 --- a/resize/resize2fs.c +++ b/resize/resize2fs.c @@ -1109,13 +1109,15 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs) { struct process_block_struct pb; ext2_ino_t ino, new_inode; - struct ext2_inode inode; + struct ext2_inode inode, *buf = NULL; + struct ext2_inode_large *large_inode; ext2_inode_scan scan = NULL; errcode_t retval; int group; char *block_buf = 0; ext2_ino_t start_to_move; blk_t orig_size, new_block; + int inode_size; if ((rfs->old_fs->group_desc_count <= rfs->new_fs->group_desc_count) && @@ -1155,6 +1157,12 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs) pb.inode = &inode; pb.error = 0; new_inode = EXT2_FIRST_INODE(rfs->new_fs->super); + inode_size = EXT2_INODE_SIZE(rfs->new_fs->super); + buf = malloc(inode_size); + if (!buf) { + retval = ENOMEM; + goto errout; + } /* * First, copy all of the inodes that need to be moved * elsewhere in the inode table @@ -1213,13 +1221,19 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs) } } ext2fs_mark_inode_bitmap(rfs->new_fs->inode_map, new_inode); + memcpy(buf, &inode, sizeof(struct ext2_inode)); + large_inode = (struct ext2_inode_large *)buf; + large_inode->i_extra_isize = sizeof(struct ext2_inode_large) - + EXT2_GOOD_OLD_INODE_SIZE; if (pb.changed) { /* Get the new version of the inode */ - retval = ext2fs_read_inode(rfs->old_fs, ino, &inode); + retval = ext2fs_read_inode_full(rfs->old_fs, ino, + buf, inode_size); if (retval) goto errout; } inode.i_ctime = time(0); - retval = ext2fs_write_inode(rfs->old_fs, new_inode, &inode); + retval = ext2fs_write_inode_full(rfs->old_fs, new_inode, + buf, inode_size); if (retval) goto errout; group = (new_inode-1) / EXT2_INODES_PER_GROUP(rfs->new_fs->super); @@ -1249,6 +1263,8 @@ errout: ext2fs_close_inode_scan(scan); if (block_buf) ext2fs_free_mem(&block_buf); + if (buf) + free(buf); return retval; }