Changeset ad34feb in mainline for uspace/lib/ext2/libext2_inode.h

Timestamp:

2011-02-23T23:07:28Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

102d400

Parents:

a54af66

Message:

Implement reading of blocks from inode in libext2

File:

• uspace/lib/ext2/libext2_inode.h (modified) (3 diffs)

uspace/lib/ext2/libext2_inode.h

@@ -51 +51 @@
         uint8_t unused2[4];
         uint32_t direct_blocks[12]; // Direct block ids stored in this inode
-        uint32_t single_indirect_block;
-        uint32_t double_indirect_block;
-        uint32_t triple_indirect_block;
+        uint32_t indirect_blocks[3];
         uint32_t version;
         uint32_t file_acl;
@@ -75 +73 @@
 #define EXT2_INODE_MODE_ACCESS_MASK     0x0FFF
 #define EXT2_INODE_MODE_TYPE_MASK       0xF000
+#define EXT2_INODE_DIRECT_BLOCKS        12
 
 typedef struct ext2_inode_ref {
@@ -88 +87 @@
 inline uint16_t ext2_inode_get_usage_count(ext2_inode_t *);
 inline uint32_t ext2_inode_get_reserved_512_blocks(ext2_inode_t *);
+inline uint32_t ext2_inode_get_reserved_blocks(ext2_superblock_t *, 
+    ext2_inode_t *);
 inline uint32_t ext2_inode_get_flags(ext2_inode_t *);
 inline uint32_t ext2_inode_get_direct_block(ext2_inode_t *, uint8_t);
-inline uint32_t ext2_inode_get_single_indirect_block(ext2_inode_t *);
-inline uint32_t ext2_inode_get_double_indirect_block(ext2_inode_t *);
-inline uint32_t ext2_inode_get_triple_indirect_block(ext2_inode_t *);
+inline uint32_t ext2_inode_get_indirect_block(ext2_inode_t *, uint8_t level);