misc: remove broken whole device check

[tools/e2fsprogs.git] / misc / dumpe2fs.c

diff --git a/misc/dumpe2fs.c b/misc/dumpe2fs.c
index 26f2e37..89a1d81 100644 (file)
--- a/misc/dumpe2fs.c
+++ b/misc/dumpe2fs.c
@@ -37,7 +37,7 @@ extern int optind;
 
 #include "ext2fs/ext2fs.h"
 #include "e2p/e2p.h"
-#include "jfs_user.h"
+#include "ext2fs/kernel-jbd.h"
 #include <uuid/uuid.h>
 
 #include "../version.h"
@@ -218,20 +218,18 @@ static void list_desc(ext2_filsys fs, int grp_only)
                        continue;
                }
 
-               printf (_("Group %lu: (Blocks "), i);
+               printf(_("Group %lu: (Blocks "), i);
                print_range(first_block, last_block);
                fputs(")", stdout);
-               print_bg_opts(fs, i);
                if (ext2fs_has_group_desc_csum(fs)) {
                        unsigned csum = ext2fs_bg_checksum(fs, i);
                        unsigned exp_csum = ext2fs_group_desc_csum(fs, i);
 
-                       printf(_("  Checksum 0x%04x"), csum);
+                       printf(_(" csum 0x%04x"), csum);
                        if (csum != exp_csum)
                                printf(_(" (EXPECTED 0x%04x)"), exp_csum);
-                       printf(_(", unused inodes %u\n"),
-                              ext2fs_bg_itable_unused(fs, i));
                }
+               print_bg_opts(fs, i);
                has_super = ((i==0) || super_blk);
                if (has_super) {
                        printf (_("  %s superblock at "),
@@ -264,7 +262,11 @@ static void list_desc(ext2_filsys fs, int grp_only)
                    EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)
                        printf(_(", csum 0x%08x"),
                               ext2fs_block_bitmap_checksum(fs, i));
-               fputs(_(", Inode bitmap at "), stdout);
+               if (getenv("DUMPE2FS_IGNORE_80COL"))
+                       fputs(_(","), stdout);
+               else
+                       fputs(_("\n "), stdout);
+               fputs(_(" Inode bitmap at "), stdout);
                print_number(ext2fs_inode_bitmap_loc(fs, i));
                print_bg_rel_offset(fs, ext2fs_inode_bitmap_loc(fs, i), 0,
                                    first_block, last_block);