Merge branch 'maint' into next

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

diff --git a/resize/main.c b/resize/main.c
index ba6bb6b18063b7d89227c9ba71a60e50b3552420..a0c31c069f3c71ca9764cf7a9949fb0979bf1dae 100644 (file)
--- a/resize/main.c
+++ b/resize/main.c
@@ -47,7 +47,8 @@ static char *device_name, *io_options;
 static void usage (char *prog)
 {
        fprintf (stderr, _("Usage: %s [-d debug_flags] [-f] [-F] [-M] [-P] "
-                          "[-p] device [-b|-s|new_size] [-z undo_file]\n\n"),
+                          "[-p] device [-b|-s|new_size] [-S RAID-stride] "
+                          "[-z undo_file]\n\n"),
                 prog);
 
        exit (1);
@@ -440,7 +441,8 @@ int main (int argc, char ** argv)
                    !print_min_size)
                        checkit = 1;
 
-               if ((fs->super->s_free_blocks_count > fs->super->s_blocks_count) ||
+               if ((ext2fs_free_blocks_count(fs->super) >
+                    ext2fs_blocks_count(fs->super)) ||
                    (fs->super->s_free_inodes_count > fs->super->s_inodes_count))
                        checkit = 1;
 
@@ -604,7 +606,6 @@ int main (int argc, char ** argv)
                exit(0);
        }
        if (mount_flags & EXT2_MF_MOUNTED) {
-               bigalloc_check(fs, force);
                retval = online_resize_fs(fs, mtpt, &new_size, flags);
        } else {
                bigalloc_check(fs, force);