mke2fs: Fix compile warning message

[tools/e2fsprogs.git] / lib / e2p / ls.c

diff --git a/lib/e2p/ls.c b/lib/e2p/ls.c
index 0bd7411..eb9a772 100644 (file)
--- a/lib/e2p/ls.c
+++ b/lib/e2p/ls.c
@@ -6,12 +6,13 @@
  *                                 Universite Pierre et Marie Curie (Paris VI)
  *
  * Copyright (C) 1995, 1996, 1997  Theodore Ts'o <tytso@mit.edu>
- * 
+ *
  * This file can be redistributed under the terms of the GNU Library General
  * Public License
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/types.h>
 #include <string.h>
 #include <grp.h>
@@ -137,6 +138,32 @@ static void print_mntopts(struct ext2_super_block * s, FILE *f)
 #endif
 }
 
+static void print_super_flags(struct ext2_super_block * s, FILE *f)
+{
+       int     flags_found = 0;
+
+       if (s->s_flags == 0)
+               return;
+
+       fputs("Filesystem flags:         ", f);
+       if (s->s_flags & EXT2_FLAGS_SIGNED_HASH) {
+               fputs("signed_directory_hash ", f);
+               flags_found++;
+       }
+       if (s->s_flags & EXT2_FLAGS_UNSIGNED_HASH) {
+               fputs("unsigned_directory_hash ", f);
+               flags_found++;
+       }
+       if (s->s_flags & EXT2_FLAGS_TEST_FILESYS) {
+               fputs("test_filesystem ", f);
+               flags_found++;
+       }
+       if (flags_found)
+               fputs("\n", f);
+       else
+               fputs("(none)\n", f);
+}
+
 
 #ifndef EXT2_INODE_SIZE
 #define EXT2_INODE_SIZE(s) sizeof(struct ext2_inode)
@@ -149,8 +176,7 @@ static void print_mntopts(struct ext2_super_block * s, FILE *f)
 void list_super2(struct ext2_super_block * sb, FILE *f)
 {
        int inode_blocks_per_group;
-       char buf[80];
-       const char *os;
+       char buf[80], *str;
        time_t  tm;
 
        inode_blocks_per_group = (((sb->s_inodes_per_group *
@@ -181,6 +207,7 @@ void list_super2(struct ext2_super_block * sb, FILE *f)
        } else
                fprintf(f, " (unknown)\n");
        print_features(sb, f);
+       print_super_flags(sb, f);
        print_mntopts(sb, f);
        fprintf(f, "Filesystem state:        ");
        print_fs_state (f, sb->s_state);
@@ -188,15 +215,9 @@ void list_super2(struct ext2_super_block * sb, FILE *f)
        fprintf(f, "Errors behavior:          ");
        print_fs_errors(f, sb->s_errors);
        fprintf(f, "\n");
-       switch (sb->s_creator_os) {
-           case EXT2_OS_LINUX: os = "Linux"; break;
-           case EXT2_OS_HURD:  os = "GNU/Hurd"; break;
-           case EXT2_OS_MASIX: os = "Masix"; break;
-           case EXT2_OS_FREEBSD: os = "FreeBSD"; break;
-           case EXT2_OS_LITES: os = "Lites"; break;
-           default:            os = "unknown"; break;
-       }
-       fprintf(f, "Filesystem OS type:       %s\n", os);
+       str = e2p_os2string(sb->s_creator_os);
+       fprintf(f, "Filesystem OS type:       %s\n", str);
+       free(str);
        fprintf(f, "Inode count:              %u\n", sb->s_inodes_count);
        fprintf(f, "Block count:              %u\n", sb->s_blocks_count);
        fprintf(f, "Reserved block count:     %u\n", sb->s_r_blocks_count);
@@ -206,15 +227,24 @@ void list_super2(struct ext2_super_block * sb, FILE *f)
        fprintf(f, "Block size:               %u\n", EXT2_BLOCK_SIZE(sb));
        fprintf(f, "Fragment size:            %u\n", EXT2_FRAG_SIZE(sb));
        if (sb->s_reserved_gdt_blocks)
-               fprintf(f, "Reserved GDT blocks:      %u\n", 
+               fprintf(f, "Reserved GDT blocks:      %u\n",
                        sb->s_reserved_gdt_blocks);
        fprintf(f, "Blocks per group:         %u\n", sb->s_blocks_per_group);
        fprintf(f, "Fragments per group:      %u\n", sb->s_frags_per_group);
        fprintf(f, "Inodes per group:         %u\n", sb->s_inodes_per_group);
        fprintf(f, "Inode blocks per group:   %u\n", inode_blocks_per_group);
+       if (sb->s_raid_stride)
+               fprintf(f, "RAID stride:              %u\n",
+                       sb->s_raid_stride);
+       if (sb->s_raid_stripe_width)
+               fprintf(f, "RAID stripe width:        %u\n",
+                       sb->s_raid_stripe_width);
        if (sb->s_first_meta_bg)
                fprintf(f, "First meta block group:   %u\n",
                        sb->s_first_meta_bg);
+       if (sb->s_log_groups_per_flex)
+               fprintf(f, "Flex block group size:    %u\n",
+                       1 << sb->s_log_groups_per_flex);
        if (sb->s_mkfs_time) {
                tm = sb->s_mkfs_time;
                fprintf(f, "Filesystem created:       %s", ctime(&tm));
@@ -237,13 +267,37 @@ void list_super2(struct ext2_super_block * sb, FILE *f)
                next = sb->s_lastcheck + sb->s_checkinterval;
                fprintf(f, "Next check after:         %s", ctime(&next));
        }
+#define POW2(x) ((__u64) 1 << (x))
+       if (sb->s_kbytes_written) {
+               fprintf(f, "Lifetime writes:          ");
+               if (sb->s_kbytes_written < POW2(13))
+                       fprintf(f, "%llu kB\n", sb->s_kbytes_written);
+               else if (sb->s_kbytes_written < POW2(23))
+                       fprintf(f, "%llu MB\n",
+                               (sb->s_kbytes_written + POW2(9)) >> 10);
+               else if (sb->s_kbytes_written < POW2(33))
+                       fprintf(f, "%llu GB\n",
+                               (sb->s_kbytes_written + POW2(19)) >> 20);
+               else if (sb->s_kbytes_written < POW2(43))
+                       fprintf(f, "%llu TB\n",
+                               (sb->s_kbytes_written + POW2(29)) >> 30);
+               else
+                       fprintf(f, "%llu PB\n",
+                               (sb->s_kbytes_written + POW2(39)) >> 40);
+       }
        fprintf(f, "Reserved blocks uid:      ");
        print_user(sb->s_def_resuid, f);
        fprintf(f, "Reserved blocks gid:      ");
        print_group(sb->s_def_resgid, f);
        if (sb->s_rev_level >= EXT2_DYNAMIC_REV) {
                fprintf(f, "First inode:              %d\n", sb->s_first_ino);
-               fprintf(f, "Inode size:           %d\n", sb->s_inode_size);
+               fprintf(f, "Inode size:           %d\n", sb->s_inode_size);
+               if (sb->s_min_extra_isize)
+                       fprintf(f, "Required extra isize:     %d\n",
+                               sb->s_min_extra_isize);
+               if (sb->s_want_extra_isize)
+                       fprintf(f, "Desired extra isize:      %d\n",
+                               sb->s_want_extra_isize);
        }
        if (!e2p_is_null_uuid(sb->s_journal_uuid))
                fprintf(f, "Journal UUID:             %s\n",