Changeset c00e729 in mainline

Timestamp:

2011-02-13T23:19:12Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f6fa2c2

Parents:

8bd5dad

Message:

Support for some more superblock fields and displaying in ext2info

Location:

uspace

Files:

• app/ext2info/ext2info.c (modified) (4 diffs)
• lib/ext2/libext2.h (modified) (3 diffs)
• lib/ext2/libext2_superblock.c (modified) (1 diff)

uspace/app/ext2info/ext2info.c

@@ -53 +53 @@
 
 static void syntax_print(void);
+static void print_superblock(ext2_superblock_t *sb);
 
 int main(int argc, char **argv)
@@ -61 +62 @@
         devmap_handle_t handle;
         ext2_filesystem_t filesystem;
-        
-        uint16_t magic;
         
         if (argc < 2) {
@@ -92 +91 @@
         }
         
-        printf("Superblock:\n");
-        magic = ext2_superblock_get_magic(filesystem.superblock);
-        if (magic == EXT2_SUPERBLOCK_MAGIC) {
-                printf("  Magic value: %X (correct)\n", magic);
-        }
-        else {
-                printf("  Magic value: %X (incorrect)\n", magic);
-        }
+        print_superblock(filesystem.superblock);
 
         ext2_filesystem_fini(&filesystem);
@@ -109 +101 @@
 static void syntax_print(void)
 {
-        printf("syntax: blkdump [--offset <num_blocks>] [--count <num_blocks>] <device_name>\n");
+        printf("syntax: ext2info <device_name>\n");
+}
+
+static void print_superblock(ext2_superblock_t *superblock)
+{
+        uint16_t magic;
+        uint32_t first_block;
+        uint32_t block_size;
+        uint32_t fragment_size;
+        uint32_t blocks_per_group;
+        uint32_t fragments_per_group;
+        uint32_t rev_major;
+        uint16_t rev_minor;
+        uint16_t state;
+        uint32_t first_inode;
+        uint16_t inode_size;
+        
+        int pos;
+        unsigned char c;
+        
+        magic = ext2_superblock_get_magic(superblock);
+        first_block = ext2_superblock_get_first_block(superblock);
+        block_size = ext2_superblock_get_block_size(superblock);
+        fragment_size = ext2_superblock_get_fragment_size(superblock);
+        blocks_per_group = ext2_superblock_get_blocks_per_group(superblock);
+        fragments_per_group = ext2_superblock_get_fragments_per_group(superblock);
+        rev_major = ext2_superblock_get_rev_major(superblock);
+        rev_minor = ext2_superblock_get_rev_minor(superblock);
+        state = ext2_superblock_get_state(superblock);
+        first_inode = ext2_superblock_get_first_inode(superblock);
+        inode_size = ext2_superblock_get_inode_size(superblock);
+        
+        printf("Superblock:\n");
+        
+        if (magic == EXT2_SUPERBLOCK_MAGIC) {
+                printf("  Magic value: %X (correct)\n", magic);
+        }
+        else {
+                printf("  Magic value: %X (incorrect)\n", magic);
+        }
+        
+        printf("  Revision: %u.%hu\n", rev_major, rev_minor);
+        printf("  State: %hu\n", state);
+        printf("  First block: %u\n", first_block);
+        printf("  Block size: %u bytes (%u KiB)\n", block_size, block_size/1024);
+        printf("  Blocks per group: %u\n", blocks_per_group);
+        printf("  Fragment size: %u bytes (%u KiB)\n", fragment_size,
+            fragment_size/1024);
+        printf("  Fragments per group: %u\n", fragments_per_group);
+        printf("  First inode: %u\n", first_inode);
+        printf("  Inode size: %hu bytes\n", inode_size);
+        
+        printf("  UUID: ");
+        for (pos = 0; pos < 16; pos++) {
+                printf("%02x", superblock->uuid[pos]);
+        }
+        printf("\n");
+        
+        printf("  Volume label: ");
+        for (pos = 0; pos < 16; pos++) {
+                c = superblock->volume_name[pos];
+                if (c >= 32 && c < 128) {
+                        putchar(c);
+                }
+                else {
+                        putchar(' ');
+                }
+        }
+        printf("\n");
+        
 }
 

uspace/lib/ext2/libext2.h

@@ -50 +50 @@
         uint8_t         unused2[12];
         uint16_t        magic; // Magic value
+        uint16_t        state; // State (mounted/unmounted)
+        uint16_t        rev_minor; // Minor revision level
+        uint8_t         unused3[12];
+        uint32_t        creator_os;
+        uint32_t        rev_major; // Major revision level
+        uint8_t         unused4[8];
+        
+        // Following is for ext2 revision 1 only
+        uint32_t        first_inode;
+        uint16_t        inode_size;
+        uint8_t         unused5[14];
+        uint8_t         uuid[16]; // UUID TODO: Create a library for UUIDs
+        uint8_t         volume_name[16];
 
 // TODO: add __attribute__((aligned(...)) for better performance?
@@ -69 +82 @@
 // allow maximum this block size
 #define EXT2_MAX_BLOCK_SIZE                     8096
+#define EXT2_REV0_FIRST_INODE           11
+#define EXT2_REV0_INODE_SIZE            128
 
 inline uint16_t ext2_superblock_get_magic(ext2_superblock_t *);
@@ -78 +93 @@
 inline uint32_t ext2_superblock_get_blocks_per_group(ext2_superblock_t *);
 inline uint32_t ext2_superblock_get_fragments_per_group(ext2_superblock_t *);
+inline uint16_t ext2_superblock_get_state(ext2_superblock_t *);
+inline uint16_t ext2_superblock_get_rev_minor(ext2_superblock_t *);
+inline uint32_t ext2_superblock_get_rev_major(ext2_superblock_t *);
+inline uint32_t ext2_superblock_get_creator_os(ext2_superblock_t *);
+inline uint32_t ext2_superblock_get_first_inode(ext2_superblock_t *);
+inline uint16_t ext2_superblock_get_inode_size(ext2_superblock_t *);
 
 extern int ext2_superblock_read_direct(devmap_handle_t, ext2_superblock_t **);

uspace/lib/ext2/libext2_superblock.c

@@ -130 +130 @@
 }
 
+/**
+ * Get filesystem state
+ * 
+ * @param sb pointer to superblock
+ */
+inline uint16_t ext2_superblock_get_state(ext2_superblock_t *sb)
+{
+        return uint16_t_le2host(sb->state);
+}
+
+/**
+ * Get minor revision number
+ * 
+ * @param sb pointer to superblock
+ */
+inline uint16_t ext2_superblock_get_rev_minor(ext2_superblock_t *sb)
+{
+        return uint16_t_le2host(sb->rev_minor);
+}
+
+/**
+ * Get major revision number
+ * 
+ * @param sb pointer to superblock
+ */
+inline uint32_t ext2_superblock_get_rev_major(ext2_superblock_t *sb)
+{
+        return uint32_t_le2host(sb->rev_major);
+}
+
+/**
+ * Get index of first regular inode
+ * 
+ * @param sb pointer to superblock
+ */
+inline uint32_t ext2_superblock_get_first_inode(ext2_superblock_t *sb)
+{
+        if (ext2_superblock_get_rev_major(sb) == 0) {
+                return EXT2_REV0_FIRST_INODE;
+        }
+        return uint32_t_le2host(sb->first_inode);
+}
+
+/**
+ * Get size of inode
+ * 
+ * @param sb pointer to superblock
+ */
+inline uint16_t ext2_superblock_get_inode_size(ext2_superblock_t *sb)
+{
+        if (ext2_superblock_get_rev_major(sb) == 0) {
+                return EXT2_REV0_INODE_SIZE;
+        }
+        return uint32_t_le2host(sb->inode_size);
+}
+
 
 /** Read a superblock directly from device (i.e. no libblock cache)