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

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.c (modified) (4 diffs)

uspace/lib/ext2/libext2_inode.c

@@ -38 +38 @@
 #include "libext2_superblock.h"
 #include <byteorder.h>
+#include <assert.h>
 
 /**
@@ -142 +143 @@
 
 /**
+ * Get number of blocks allocated for contents of the file
+ * represented by this inode.
+ * 
+ * @param inode pointer to inode
+ */
+inline uint32_t ext2_inode_get_reserved_blocks(ext2_superblock_t *sb,
+    ext2_inode_t *inode)
+{
+        return ext2_inode_get_reserved_512_blocks(inode) /
+            (ext2_superblock_get_block_size(sb) / 512);
+}
+
+/**
  * Get inode flags
  * 
@@ -158 +172 @@
 inline uint32_t ext2_inode_get_direct_block(ext2_inode_t *inode, uint8_t idx)
 {
+        assert(idx < EXT2_INODE_DIRECT_BLOCKS);
         return uint32_t_le2host(inode->direct_blocks[idx]);
 }
@@ -165 +180 @@
  * 
  * @param inode pointer to inode
+ * @param idx Indirection level. Valid values are 0 <= idx < 3, where 0 is
+ *            singly-indirect block and 2 is triply-indirect-block
  */
-inline uint32_t ext2_inode_get_single_indirect_block(ext2_inode_t *inode)
+inline uint32_t ext2_inode_get_indirect_block(ext2_inode_t *inode, uint8_t idx)
 {
-        return uint32_t_le2host(inode->single_indirect_block);
+        assert(idx < 3);
+        return uint32_t_le2host(inode->indirect_blocks[idx]);
 }
-
-/**
- * Get double indirect block ID
- * 
- * @param inode pointer to inode
- */
-inline uint32_t ext2_inode_get_double_indirect_block(ext2_inode_t *inode)
-{
-        return uint32_t_le2host(inode->double_indirect_block);
-}
-
-/**
- * Get triple indirect block ID
- * 
- * @param inode pointer to inode
- */
-inline uint32_t ext2_inode_get_triple_indirect_block(ext2_inode_t *inode)
-{
-        return uint32_t_le2host(inode->triple_indirect_block);
-}
-
-
 
 /** @}