Changeset c00e729 in mainline for uspace/lib/ext2

Timestamp:

2011-02-13T23:19:12Z (14 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/lib/ext2

Files:

• libext2.h (modified) (3 diffs)
• libext2_superblock.c (modified) (1 diff)

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)