OSDN Git Service

resize2fs: don't fail when shrinking an empty file system
authorTheodore Ts'o <tytso@mit.edu>
Sun, 16 Oct 2011 23:29:40 +0000 (19:29 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 16 Oct 2011 23:29:40 +0000 (19:29 -0400)
This commit fixes a failure when running the commands:

dd if=/dev/zero of=fs bs=1k count=100k; mke2fs fs; resize2fs -Mp fs

We should not try truncating the file system if there is only a single
block group in the file system.

Addresses-Sourceforge-Bug: #3404051

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
resize/resize2fs.c

index 3c16766..a957850 100644 (file)
@@ -335,7 +335,7 @@ retry:
                fs->super->s_blocks_per_group;
        if ((fs->group_desc_count == 1) && rem && (rem < overhead))
                return EXT2_ET_TOOSMALL;
-       if (rem && (rem < overhead+50)) {
+       if ((fs->group_desc_count > 1) && rem && (rem < overhead+50)) {
                ext2fs_blocks_count_set(fs->super,
                                        ext2fs_blocks_count(fs->super) - rem);
                goto retry;