vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

resize2fs: Fix resizing filesystems with large inodes 

Use ext2fs_get_next_inode_full() in resize2fs and clean up large inode
handling; previous attempt was not properly handling all cases, and
was incorrectly setting i_extra_isize.  This caused some extended
attributes to get removed or randomly assigned to other inodes as a
result of the resize, which can be unfortunate on systems using
SELinux.

The previous commit didn't fix things completely on big-endian systems
like PowerPC.

Addresses-Red-Hat-Bugzilla: #434893

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
bitmap-optimize
Theodore Ts'o 2008-03-08 20:20:40 -05:00
parent dd232049d1
commit edfd9b0a9f
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
resize/resize2fs.c
View File

@ -1109,8 +1109,7 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs)
{ {
struct process_block_struct pb; struct process_block_struct pb;
ext2_ino_t ino, new_inode; ext2_ino_t ino, new_inode;
struct ext2_inode inode, *buf = NULL; struct ext2_inode *inode = NULL;
struct ext2_inode_large *large_inode;
ext2_inode_scan scan = NULL; ext2_inode_scan scan = NULL;
errcode_t retval; errcode_t retval;
int group; int group;
@ -1154,12 +1153,12 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs)
} }
ext2fs_set_inode_callback(scan, progress_callback, (void *) rfs); ext2fs_set_inode_callback(scan, progress_callback, (void *) rfs);
pb.rfs = rfs; pb.rfs = rfs;
pb.inode = &inode; pb.inode = inode;
pb.error = 0; pb.error = 0;
new_inode = EXT2_FIRST_INODE(rfs->new_fs->super); new_inode = EXT2_FIRST_INODE(rfs->new_fs->super);
inode_size = EXT2_INODE_SIZE(rfs->new_fs->super); inode_size = EXT2_INODE_SIZE(rfs->new_fs->super);
buf = malloc(inode_size); inode = malloc(inode_size);
if (!buf) { if (!inode) {
retval = ENOMEM; retval = ENOMEM;
goto errout; goto errout;
} }
@ -1168,29 +1167,29 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs)
* elsewhere in the inode table * elsewhere in the inode table
*/ */
while (1) { while (1) {
retval = ext2fs_get_next_inode(scan, &ino, &inode); retval = ext2fs_get_next_inode_full(scan, &ino, inode, inode_size);
if (retval) goto errout; if (retval) goto errout;
if (!ino) if (!ino)
break; break;
if (inode.i_links_count == 0 && ino != EXT2_RESIZE_INO) if (inode->i_links_count == 0 && ino != EXT2_RESIZE_INO)
continue; /* inode not in use */ continue; /* inode not in use */
pb.is_dir = LINUX_S_ISDIR(inode.i_mode); pb.is_dir = LINUX_S_ISDIR(inode->i_mode);
pb.changed = 0; pb.changed = 0;
if (inode.i_file_acl && rfs->bmap) { if (inode->i_file_acl && rfs->bmap) {
new_block = ext2fs_extent_translate(rfs->bmap, new_block = ext2fs_extent_translate(rfs->bmap,
inode.i_file_acl); inode->i_file_acl);
if (new_block) { if (new_block) {
inode.i_file_acl = new_block; inode->i_file_acl = new_block;
retval = ext2fs_write_inode(rfs->old_fs, retval = ext2fs_write_inode_full(rfs->old_fs,
ino, &inode); ino, inode, inode_size);
if (retval) goto errout; if (retval) goto errout;
} }
} }
if (ext2fs_inode_has_valid_blocks(&inode) && if (ext2fs_inode_has_valid_blocks(inode) &&
(rfs->bmap || pb.is_dir)) { (rfs->bmap || pb.is_dir)) {
pb.ino = ino; pb.ino = ino;
retval = ext2fs_block_iterate2(rfs->old_fs, retval = ext2fs_block_iterate2(rfs->old_fs,
@ -1221,23 +1220,19 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs)
} }
} }
ext2fs_mark_inode_bitmap(rfs->new_fs->inode_map, new_inode); 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) { if (pb.changed) {
/* Get the new version of the inode */ /* Get the new version of the inode */
retval = ext2fs_read_inode_full(rfs->old_fs, ino, retval = ext2fs_read_inode_full(rfs->old_fs, ino,
buf, inode_size); inode, inode_size);
if (retval) goto errout; if (retval) goto errout;
} }
inode.i_ctime = time(0); inode->i_ctime = time(0);
retval = ext2fs_write_inode_full(rfs->old_fs, new_inode, retval = ext2fs_write_inode_full(rfs->old_fs, new_inode,
buf, inode_size); inode, inode_size);
if (retval) goto errout; if (retval) goto errout;
group = (new_inode-1) / EXT2_INODES_PER_GROUP(rfs->new_fs->super); group = (new_inode-1) / EXT2_INODES_PER_GROUP(rfs->new_fs->super);
if (LINUX_S_ISDIR(inode.i_mode)) if (LINUX_S_ISDIR(inode->i_mode))
rfs->new_fs->group_desc[group].bg_used_dirs_count++; rfs->new_fs->group_desc[group].bg_used_dirs_count++;
#ifdef RESIZE2FS_DEBUG #ifdef RESIZE2FS_DEBUG
@ -1263,8 +1258,8 @@ errout:
ext2fs_close_inode_scan(scan); ext2fs_close_inode_scan(scan);
if (block_buf) if (block_buf)
ext2fs_free_mem(&block_buf); ext2fs_free_mem(&block_buf);
if (buf) if (inode)
free(buf); free(inode);
return retval; return retval;
} }