Changeset 7bc4508 in mainline for uspace/srv/fs/ext4fs/ext4fs_ops.c

Timestamp:

2011-10-18T19:58:36Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

7bd2c19

Parents:

12f55220

Message:

First part of reading htree directory index - the most important functionality (computing hashes) still missing

File:

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

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -75 +75 @@
 static int ext4fs_read_directory(ipc_callid_t, aoff64_t, size_t,
     ext4fs_instance_t *, ext4_inode_ref_t *, size_t *);
-static int ext4fs_read_dx_directory(ipc_callid_t, aoff64_t, size_t,
-    ext4fs_instance_t *, ext4_inode_ref_t *, size_t *);
 static int ext4fs_read_file(ipc_callid_t, aoff64_t, size_t, ext4fs_instance_t *,
     ext4_inode_ref_t *, size_t *);
@@ -216 +214 @@
             EXT4_INODE_MODE_DIRECTORY)) {
                 return ENOTDIR;
+        }
+
+        // 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);
+                }
+
         }
 
@@ -748 +765 @@
         bool found = false;
 
-        // TODO check super block COMPAT FEATURES
-        if (ext4_inode_has_flag(inode_ref->inode, EXT4_INODE_FLAG_INDEX)) {
-                rc = ext4fs_read_dx_directory(callid, pos, size, inst, inode_ref, rbytes);
-                // TODO return...
-                // return rc;
-        }
-
         rc = ext4_directory_iterator_init(&it, inst->filesystem, inode_ref, pos);
         if (rc != EOK) {
@@ -825 +835 @@
                 return ENOENT;
         }
-}
-
-int ext4fs_read_dx_directory(ipc_callid_t callid, aoff64_t pos, size_t size,
-    ext4fs_instance_t *inst, ext4_inode_ref_t *inode_ref, size_t *rbytes)
-{
-        EXT4FS_DBG("Directory using HTree index");
-        return ENOTSUP;
 }