Changeset f6fa2c2 in mainline for uspace/lib/ext2

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/lib/ext2

Files:

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

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)