Changeset acd869e in mainline

Timestamp:

2011-10-11T10:32:02Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

8958a26

Parents:

6d52126b

Message:

Preparations for extent reading

Location:

uspace/lib/ext4

Files:

• libext4_extent.c (modified) (1 diff)
• libext4_extent.h (modified) (1 diff)
• libext4_filesystem.c (modified) (1 diff)
• libext4_inode.c (modified) (2 diffs)
• libext4_inode.h (modified) (3 diffs)

uspace/lib/ext4/libext4_extent.c

@@ -36 +36 @@
  */
 
+#include <byteorder.h>
+#include "libext4_extent.h"
 
+uint16_t ext4_extent_header_get_magic(ext4_extent_header_t *header)
+{
+        return uint16_t_le2host(header->magic);
+}
+
+uint16_t ext4_extent_header_get_entries_count(ext4_extent_header_t *header)
+{
+        return uint16_t_le2host(header->entries_count);
+}
+
+uint16_t ext4_extent_header_get_max_entries_count(ext4_extent_header_t *header)
+{
+        return uint16_t_le2host(header->max_entries_count);
+}
+
+uint16_t ext4_extent_header_get_depth(ext4_extent_header_t *header)
+{
+        return uint16_t_le2host(header->depth);
+}
+
+uint32_t ext4_extent_header_get_generation(ext4_extent_header_t *header)
+{
+        return uint32_t_le2host(header->generation);
+}
 
 /**

uspace/lib/ext4/libext4_extent.h

@@ -68 +68 @@
 } ext4_extent_header_t;
 
-#define EXT4_EXTENT_MAGIC host2uint16_t_le(0xF30A)
+#define EXT4_EXTENT_MAGIC       0xF30A
+
+extern uint16_t ext4_extent_header_get_magic(ext4_extent_header_t *);
+extern uint16_t ext4_extent_header_get_entries_count(ext4_extent_header_t *);
+extern uint16_t ext4_extent_header_get_max_entries_count(ext4_extent_header_t *);
+extern uint16_t ext4_extent_header_get_depth(ext4_extent_header_t *);
+extern uint32_t ext4_extent_header_get_generation(ext4_extent_header_t *);
 
 #endif

uspace/lib/ext4/libext4_filesystem.c

@@ -301 +301 @@
         block_t *block;
 
+        // TODO extents
+        if (ext4_inode_has_flag(inode, EXT4_INODE_FLAG_EXTENTS)) {
+                EXT4FS_DBG("Inode contains Extent");
+                // TODO
+                /*
+                current_block = ext4_inode_get_extent_block(inode, iblock);
+                *fblock = current_block;
+                return EOK;
+                */
+
+        }
+
         /* Handle simple case when we are dealing with direct reference */
         if (iblock < EXT4_INODE_DIRECT_BLOCK_COUNT) {

uspace/lib/ext4/libext4_inode.c

@@ -62 +62 @@
         uint32_t major_rev = ext4_superblock_get_rev_level(sb);
 
-        if (major_rev > 0 && ext4_inode_is_type(sb, inode, EXT4_INODE_MODE_FILE)) {
+        if ((major_rev > 0) && ext4_inode_is_type(sb, inode, EXT4_INODE_MODE_FILE)) {
                 return ((uint64_t)uint32_t_le2host(inode->size_hi)) << 32 |
                             ((uint64_t)uint32_t_le2host(inode->size_lo));
@@ -102 +102 @@
 }
 
+uint32_t ext4_inode_get_extent_block(ext4_inode_t *inode, uint64_t idx)
+{
+        //ext4_extent_header_t *header = ext4_inode_get_extent_header(inode);
+        // TODO search required block
+        return 0;
+
+}
+
+ext4_extent_header_t * ext4_inode_get_extent_header(ext4_inode_t *inode)
+{
+        return (ext4_extent_header_t *)inode->blocks;
+}
 
 // Flags checker

uspace/lib/ext4/libext4_inode.h

@@ -36 +36 @@
 #include <libblock.h>
 #include <sys/types.h>
+#include "libext4_extent.h"
 #include "libext4_superblock.h"
 
@@ -167 +168 @@
 uint32_t ext4_inode_get_direct_block(ext4_inode_t *, uint8_t);
 uint32_t ext4_inode_get_indirect_block(ext4_inode_t *, uint8_t);
-
+uint32_t ext4_inode_get_extent_block(ext4_inode_t *, uint64_t);
 /*
 uint32_t blocks[EXT4_INODE_BLOCKS]; // Pointers to blocks
@@ -181 +182 @@
 */
 
+extern ext4_extent_header_t * ext4_inode_get_extent_header(ext4_inode_t *);
 extern bool ext4_inode_has_flag(ext4_inode_t *, uint32_t);