Changeset f6fa2c2 in mainline

Timestamp:

2011-02-14T20:24:40Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3949e8a0

Parents:

c00e729

Message:

Added read support and code in ext2info for more superblock entries

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

@@ -117 +117 @@
         uint32_t first_inode;
         uint16_t inode_size;
+        uint32_t total_blocks;
+        uint32_t reserved_blocks;
+        uint32_t free_blocks;
+        uint32_t total_inodes;
+        uint32_t free_inodes;   
+        uint32_t os;
         
         int pos;
@@ -132 +138 @@
         first_inode = ext2_superblock_get_first_inode(superblock);
         inode_size = ext2_superblock_get_inode_size(superblock);
+        total_blocks = ext2_superblock_get_total_block_count(superblock);
+        reserved_blocks = ext2_superblock_get_reserved_block_count(superblock);
+        free_blocks = ext2_superblock_get_free_block_count(superblock);
+        total_inodes = ext2_superblock_get_total_inode_count(superblock);
+        free_inodes = ext2_superblock_get_free_inode_count(superblock);
+        os = ext2_superblock_get_os(superblock);
         
         printf("Superblock:\n");
@@ -144 +156 @@
         printf("  Revision: %u.%hu\n", rev_major, rev_minor);
         printf("  State: %hu\n", state);
+        printf("  Creator OS: %u\n", os);
         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("  Total blocks: %u\n", total_blocks);
+        printf("  Reserved blocks: %u\n", reserved_blocks);
+        printf("  Free blocks: %u\n", free_blocks);
         printf("  Fragment size: %u bytes (%u KiB)\n", fragment_size,
             fragment_size/1024);
@@ -152 +168 @@
         printf("  First inode: %u\n", first_inode);
         printf("  Inode size: %hu bytes\n", inode_size);
+        printf("  Total inodes: %u\n", total_inodes);
+        printf("  Free inodes: %u\n", free_inodes);
         
-        printf("  UUID: ");
-        for (pos = 0; pos < 16; pos++) {
-                printf("%02x", superblock->uuid[pos]);
+        
+        if (rev_major == 1) {
+                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");
         }
-        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

@@ -41 +41 @@
 
 typedef struct ext2_superblock {
-        uint8_t         unused[20];
+        uint32_t        total_inode_count; // Total number of inodes
+        uint32_t        total_block_count; // Total number of blocks
+        uint32_t        reserved_block_count; // Total number of reserved blocks
+        uint32_t        free_block_count; // Total number of free blocks
+        uint32_t        free_inode_count; // Total number of free inodes
         uint32_t        first_block; // Block containing the superblock (either 0 or 1)
         uint32_t        block_size_log2; // log_2(block_size)
@@ -51 +55 @@
         uint16_t        magic; // Magic value
         uint16_t        state; // State (mounted/unmounted)
+        uint16_t        error_behavior; // What to do when errors are encountered
         uint16_t        rev_minor; // Minor revision level
-        uint8_t         unused3[12];
-        uint32_t        creator_os;
+        uint8_t         unused3[8];
+        uint32_t        os; // OS that created the filesystem
         uint32_t        rev_major; // Major revision level
-        uint8_t         unused4[8];
+        uint8_t         unused4[4];
         
         // Following is for ext2 revision 1 only
@@ -96 +101 @@
 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_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 *);
+inline uint32_t ext2_superblock_get_total_inode_count(ext2_superblock_t *);
+inline uint32_t ext2_superblock_get_total_block_count(ext2_superblock_t *);
+inline uint32_t ext2_superblock_get_reserved_block_count(ext2_superblock_t *);
+inline uint32_t ext2_superblock_get_free_block_count(ext2_superblock_t *);
+inline uint32_t ext2_superblock_get_free_inode_count(ext2_superblock_t *);
 
 extern int ext2_superblock_read_direct(devmap_handle_t, ext2_superblock_t **);

uspace/lib/ext2/libext2_superblock.c

@@ -186 +186 @@
 }
 
+/**
+ * Get total inode count
+ * 
+ * @param sb pointer to superblock
+ */
+inline uint32_t ext2_superblock_get_total_inode_count(ext2_superblock_t *sb)
+{
+        return uint32_t_le2host(sb->total_inode_count);
+}
+
+/**
+ * Get total block count
+ * 
+ * @param sb pointer to superblock
+ */
+inline uint32_t ext2_superblock_get_total_block_count(ext2_superblock_t *sb)
+{
+        return uint32_t_le2host(sb->total_block_count);
+}
+
+/**
+ * Get amount of blocks reserved for the superuser
+ * 
+ * @param sb pointer to superblock
+ */
+inline uint32_t ext2_superblock_get_reserved_block_count(ext2_superblock_t *sb)
+{
+        return uint32_t_le2host(sb->reserved_block_count);
+}
+
+/**
+ * Get amount of free blocks
+ * 
+ * @param sb pointer to superblock
+ */
+inline uint32_t ext2_superblock_get_free_block_count(ext2_superblock_t *sb)
+{
+        return uint32_t_le2host(sb->free_block_count);
+}
+
+/**
+ * Get amount of free inodes
+ * 
+ * @param sb pointer to superblock
+ */
+inline uint32_t ext2_superblock_get_free_inode_count(ext2_superblock_t *sb)
+{
+        return uint32_t_le2host(sb->free_inode_count);
+}
+
+/**
+ * Get id of operating system that created the filesystem
+ * 
+ * @param sb pointer to superblock
+ */
+inline uint32_t ext2_superblock_get_os(ext2_superblock_t *sb)
+{
+        return uint32_t_le2host(sb->os);
+}
 
 /** Read a superblock directly from device (i.e. no libblock cache)