diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2010-12-22 19:00:21 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-12-22 19:00:21 -0500 |
| commit | da2a5a4baede2a227d2da587eb74ceae66778fbc (patch) | |
| tree | 5a2e070684ffc2f63873ee24a4b6a499ce9985e6 /resize | |
| parent | 9b27e9cc320dd7da24356561b3b12c66f2540432 (diff) | |
| parent | 7267e3d3fdbc911477bfd7fb8bb5232252168d0a (diff) | |
| download | e2fsprogs-da2a5a4baede2a227d2da587eb74ceae66778fbc.tar.gz | |
Merge branch 'maint' into next
Conflicts:
resize/resize2fs.c
Diffstat (limited to 'resize')
| -rw-r--r-- | resize/resize2fs.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/resize/resize2fs.c b/resize/resize2fs.c index 064c4c48..55e5512d 100644 --- a/resize/resize2fs.c +++ b/resize/resize2fs.c @@ -1715,7 +1715,6 @@ static errcode_t fix_resize_inode(ext2_filsys fs) struct ext2_inode inode; errcode_t retval; char * block_buf; - blk64_t blk; if (!(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE)) @@ -1727,20 +1726,6 @@ static errcode_t fix_resize_inode(ext2_filsys fs) retval = ext2fs_read_inode(fs, EXT2_RESIZE_INO, &inode); if (retval) goto errout; - if (fs->super->s_reserved_gdt_blocks == 0) { - fs->super->s_feature_compat &= - ~EXT2_FEATURE_COMPAT_RESIZE_INODE; - ext2fs_mark_super_dirty(fs); - - if ((blk = inode.i_block[EXT2_DIND_BLOCK]) != 0) - ext2fs_block_alloc_stats2(fs, blk, -1); - - memset(&inode, 0, sizeof(inode)); - - retval = ext2fs_write_inode(fs, EXT2_RESIZE_INO, &inode); - goto errout; - } - ext2fs_iblk_set(fs, &inode, 1); retval = ext2fs_write_inode(fs, EXT2_RESIZE_INO, &inode); |