Whamcloud - gitweb
libext2fs: external journal devices should not cause ext2fs_open2 to fail
authorTheodore Ts'o <tytso@mit.edu>
Tue, 17 Mar 2009 02:16:44 +0000 (22:16 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 17 Mar 2009 02:16:44 +0000 (22:16 -0400)
This fixes a regression introduced in commit 79a9ab14 which caused
attempts to open external journals to fail due to overly strict
filesystem consistency checks.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
lib/ext2fs/openfs.c

index cdfeaec..f6fe3f0 100644 (file)
@@ -243,10 +243,6 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
                goto cleanup;
        }
        fs->fragsize = EXT2_FRAG_SIZE(fs->super);
-       if (EXT2_INODES_PER_GROUP(fs->super) == 0) {
-               retval = EXT2_ET_CORRUPT_SUPERBLOCK;
-               goto cleanup;
-       }
        fs->inode_blocks_per_group = ((EXT2_INODES_PER_GROUP(fs->super) *
                                       EXT2_INODE_SIZE(fs->super) +
                                       EXT2_BLOCK_SIZE(fs->super) - 1) /
@@ -273,6 +269,11 @@ errcode_t ext2fs_open2(const char *name, const char *io_options,
                return 0;
        }
 
+       if (EXT2_INODES_PER_GROUP(fs->super) == 0) {
+               retval = EXT2_ET_CORRUPT_SUPERBLOCK;
+               goto cleanup;
+       }
+
        /*
         * Read group descriptors
         */