[PATCH] resize2fs vs. large inodes, take 2

[Eric Sandeen <sandeen@redhat.com>]

large inodes with both fast symlinks and in-inode selinux attrs
were not surviving moves via resize2fs.

Somehow I missed that there was an ext2fs_get_next_inode_full... 
I think the below fix is correct, on top of my previous patch
(and what is in e2fsprogs-1.40.7...)

But I don't mind a review ;)

Thanks,
-Eric

------------------- changelog ----------------------

Use ext2fs_get_next_inode_full() in resize2fs; previous attempt
was not properly handling all cases, and was incorrectly setting
i_extra_isize.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

Index: e2fsprogs-1.40.7/resize/resize2fs.c
===================================================================
--- e2fsprogs-1.40.7.orig/resize/resize2fs.c
+++ e2fsprogs-1.40.7/resize/resize2fs.c
@@ -1168,11 +1168,12 @@ static errcode_t inode_scan_and_fix(ext2
 	 * elsewhere in the inode table
 	 */
 	while (1) {
-		retval = ext2fs_get_next_inode(scan, &ino, &inode);
+		retval = ext2fs_get_next_inode_full(scan, &ino, buf, inode_size);
 		if (retval) goto errout;
 		if (!ino)
 			break;
 
+		memcpy(&inode, buf, sizeof(struct ext2_inode));
 		if (inode.i_links_count == 0 && ino != EXT2_RESIZE_INO)
 			continue; /* inode not in use */
 
@@ -1221,10 +1222,7 @@ static errcode_t inode_scan_and_fix(ext2
 			}
 		}
 		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_full(rfs->old_fs, ino,