Changeset 8158db7 in mainline for uspace/srv/fs/ext4fs/ext4fs_ops.c

Timestamp:

2011-10-19T11:44:13Z (14 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)

File:

• uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (2 diffs)

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;
         }