Merge branch 'maint' into next

[thirdparty/e2fsprogs.git] / resize / online.c

diff --git a/resize/online.c b/resize/online.c
index 2d34640eef6023702387baf94b1bcf4ddcddaa92..2caf946a8a52718b5709af86040d9d6e93b62196 100644 (file)
--- a/resize/online.c
+++ b/resize/online.c
@@ -61,7 +61,7 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
        double                  percent;
        dgrp_t                  i;
        blk_t                   size;
-       int                     fd, overhead;
+       int                     fd;
        int                     use_old_ioctl = 1;
        int                     no_meta_bg_resize = 0;
        int                     no_resize_ioctl = 0;
@@ -76,6 +76,13 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
                        no_resize_ioctl = 1;
        }
 
+       if (ext2fs_has_feature_sparse_super2(fs->super) &&
+           (access("/sys/fs/ext4/features/sparse_super2", R_OK) != 0)) {
+               com_err(program_name, 0, _("kernel does not support online "
+                                          "resize with sparse_super2"));
+               exit(1);
+       }
+
        printf(_("Filesystem at %s is mounted on %s; "
                 "on-line resizing required\n"), fs->device_name, mtpt);
 
@@ -101,16 +108,14 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
         */
        if ((access("/sys/fs/ext4/features/meta_bg_resize", R_OK) != 0) ||
            no_meta_bg_resize) {
-               if (!EXT2_HAS_COMPAT_FEATURE(fs->super,
-                                       EXT2_FEATURE_COMPAT_RESIZE_INODE) &&
+               if (!ext2fs_has_feature_resize_inode(fs->super) &&
                    (new_desc_blocks != fs->desc_blocks)) {
                        com_err(program_name, 0,
                                _("Filesystem does not support online resizing"));
                        exit(1);
                }
 
-               if (EXT2_HAS_COMPAT_FEATURE(fs->super,
-                                       EXT2_FEATURE_COMPAT_RESIZE_INODE) &&
+               if (ext2fs_has_feature_resize_inode(fs->super) &&
                    new_desc_blocks > (fs->desc_blocks +
                                       fs->super->s_reserved_gdt_blocks)) {
                        com_err(program_name, 0,
@@ -184,15 +189,19 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
                ext2fs_blocks_count(sb);
 
        retval = ext2fs_read_bitmaps(fs);
-       if (retval)
+       if (retval) {
+               close(fd);
                return retval;
+       }
 
        retval = ext2fs_dup_handle(fs, &new_fs);
-       if (retval)
+       if (retval) {
+               close(fd);
                return retval;
+       }
 
        /* The current method of adding one block group at a time to a
-        * mounted filesystem means it is impossible to accomodate the
+        * mounted filesystem means it is impossible to accommodate the
         * flex_bg allocation method of placing the metadata together
         * in a single block group.  For now we "fix" this issue by
         * using the traditional layout for new block groups, where
@@ -201,10 +210,12 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
         * the layout advantages of flex_bg in the new block groups,
         * but at least it allows on-line resizing to function.
         */
-       new_fs->super->s_feature_incompat &= ~EXT4_FEATURE_INCOMPAT_FLEX_BG;
+       ext2fs_clear_feature_flex_bg(new_fs->super);
        retval = adjust_fs_info(new_fs, fs, 0, *new_size);
-       if (retval)
+       if (retval) {
+               close(fd);
                return retval;
+       }
 
        printf(_("Performing an on-line resize of %s to %llu (%dk) blocks.\n"),
               fs->device_name, *new_size, fs->blocksize / 1024);
@@ -222,13 +233,6 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt,
 
        for (i = fs->group_desc_count;
             i < new_fs->group_desc_count; i++) {
-
-               overhead = (int) (2 + new_fs->inode_blocks_per_group);
-
-               if (ext2fs_bg_has_super(new_fs, new_fs->group_desc_count - 1))
-                       overhead += 1 + new_fs->desc_blocks +
-                               new_fs->super->s_reserved_gdt_blocks;
-
                input.group = i;
                input.block_bitmap = ext2fs_block_bitmap_loc(new_fs, i);
                input.inode_bitmap = ext2fs_inode_bitmap_loc(new_fs, i);