Changeset 8158db7 in mainline

Timestamp:

2011-10-19T11:44:13Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

246a5af

Parents:

7bd2c19

Message:

Hash functions implementation (ported from Linux)

Location:

uspace

Files:

• lib/ext4/Makefile (modified) (1 diff)
• lib/ext4/libext4.h (modified) (1 diff)
• lib/ext4/libext4_directory.c (modified) (5 diffs)
• lib/ext4/libext4_directory.h (modified) (2 diffs)
• lib/ext4/libext4_hash.c (added)
• lib/ext4/libext4_hash.h (added)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (2 diffs)

uspace/lib/ext4/Makefile

@@ -37 +37 @@
         libext4_extent.c \
         libext4_filesystem.c \
+        libext4_hash.c \
         libext4_inode.c \
         libext4_superblock.c

uspace/lib/ext4/libext4.h

@@ -38 +38 @@
 #include "libext4_extent.h"
 #include "libext4_filesystem.h"
+#include "libext4_hash.h"
 #include "libext4_inode.h"
 #include "libext4_superblock.h"

uspace/lib/ext4/libext4_directory.c

@@ -246 +246 @@
 
 int ext4_directory_dx_find_entry(ext4_directory_iterator_t *it,
-                ext4_filesystem_t *fs, ext4_inode_ref_t *inode_ref, const char *name)
+                ext4_filesystem_t *fs, ext4_inode_ref_t *inode_ref, size_t len, const char *name)
 {
         int rc;
@@ -253 +253 @@
         ext4_directory_dx_root_t *root;
         uint32_t hash;
-        ext4_directory_dx_hash_info_t hinfo;
+        ext4_hash_info_t hinfo;
 
         // get direct block 0 (index root)
@@ -315 +315 @@
 
         hinfo.hash_version = ext4_directory_dx_root_info_get_hash_version(&root->info);
-        if ((hinfo.hash_version <= EXT4_DIRECTORY_DX_HASH_TEA)
+        if ((hinfo.hash_version <= EXT4_HASH_VERSION_TEA)
                         && (ext4_superblock_has_flag(fs->superblock, EXT4_SUPERBLOCK_FLAGS_UNSIGNED_HASH))) {
                 // 3 is magic from ext4 linux implementation
@@ -324 +324 @@
         hinfo.hash = 0;
         if (name) {
-                ext4_directory_hash(&hinfo, name);
+                ext4_hash_string(&hinfo, len, name);
         }
 
@@ -387 +387 @@
 }
 
-void ext4_directory_hash(ext4_directory_dx_hash_info_t *hinfo, const char* name)
-{
-        // TODO
-}
 
 /**

uspace/lib/ext4/libext4_directory.h

@@ -96 +96 @@
 } ext4_directory_dx_root_t;
 
-typedef struct ext4_directory_dx_hash_info {
-        uint32_t hash;
-        uint32_t minor_hash;
-        uint32_t hash_version;
-        uint32_t *seed;
-} ext4_directory_dx_hash_info_t;
-
 
 #define EXT4_ERR_BAD_DX_DIR                     (-75000)
-
-#define EXT4_DIRECTORY_DX_HASH_LEGACY                           0
-#define EXT4_DIRECTORY_DX_HASH_HALF_MD4                         1
-#define EXT4_DIRECTORY_DX_HASH_TEA                                      2
-#define EXT4_DIRECTORY_DX_HASH_LEGACY_UNSIGNED          3
-#define EXT4_DIRECTORY_DX_HASH_HALF_MD4_UNSIGNED        4
-#define EXT4_DIRECTORY_DX_HASH_TEA_UNSIGNED                     5
-
-#define EXT4_DIRECTORY_HTREE_EOF        0x7fffffff
+#define EXT4_DIRECTORY_HTREE_EOF        (uint32_t)0x7fffffff
 
 
@@ -138 +123 @@
 extern int ext4_directory_iterator_fini(ext4_directory_iterator_t *);
 extern int ext4_directory_dx_find_entry(ext4_directory_iterator_t *,
-                ext4_filesystem_t *, ext4_inode_ref_t *, const char *);
-
-extern void ext4_directory_hash(ext4_directory_dx_hash_info_t *, const char* name);
+                ext4_filesystem_t *, ext4_inode_ref_t *, size_t, const char *);
 
 #endif

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -216 +216 @@
         }
 
-        // TODO check super block COMPAT FEATURES
-        if (ext4_inode_has_flag(eparent->inode_ref->inode, EXT4_INODE_FLAG_INDEX)) {
-
-                rc = ext4_directory_dx_find_entry(&it, fs, eparent->inode_ref, component);
-
-                // Index isn't corrupted
-                if (rc != EXT4_ERR_BAD_DX_DIR) {
-
-                        // TODO check return value
-                        if (rc != EOK) {
-                                return rc;
-                        }
-
-                        inode = ext4_directory_entry_ll_get_inode(it.current);
-                        return ext4fs_node_get_core(rfn, eparent->instance, inode);
-                }
-
-        }
-
-        rc = ext4_directory_iterator_init(&it, fs, eparent->inode_ref, 0);
-        if (rc != EOK) {
-                return rc;
-        }
-
         /* Find length of component in bytes
          * TODO: check for library function call that does this
@@ -246 +222 @@
         while (*(component+component_size) != 0) {
                 component_size++;
+        }
+
+        // TODO check super block COMPAT FEATURES
+        if (ext4_inode_has_flag(eparent->inode_ref->inode, EXT4_INODE_FLAG_INDEX)) {
+
+                rc = ext4_directory_dx_find_entry(&it, fs, eparent->inode_ref, component_size, component);
+
+                // Index isn't corrupted
+                if (rc != EXT4_ERR_BAD_DX_DIR) {
+
+                        // TODO check return value
+                        if (rc != EOK) {
+                                return rc;
+                        }
+
+                        inode = ext4_directory_entry_ll_get_inode(it.current);
+                        return ext4fs_node_get_core(rfn, eparent->instance, inode);
+                }
+
+        }
+
+        rc = ext4_directory_iterator_init(&it, fs, eparent->inode_ref, 0);
+        if (rc != EOK) {
+                return rc;
         }