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

Timestamp:

2012-03-03T17:44:38Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

e63ce679

Parents:

c30a015

Message:

Code refactoring (for dentry searching)

File:

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

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -210 +210 @@
         }
 
-
-        ext4_directory_iterator_t it;
-        rc = ext4_directory_iterator_init(&it, fs, eparent->inode_ref, 0);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        rc = ext4_directory_find_entry(&it, eparent->inode_ref, component);
-        if (rc != EOK) {
-                ext4_directory_iterator_fini(&it);
+        ext4_directory_search_result_t result;
+        rc = ext4_directory_find_entry(fs, &result, eparent->inode_ref, component);
+        if (rc != EOK) {
                 if (rc == ENOENT) {
                         *rfn = NULL;
@@ -227 +220 @@
         }
 
-        uint32_t inode = ext4_directory_entry_ll_get_inode(it.current);
+        uint32_t inode = ext4_directory_entry_ll_get_inode(result.dentry);
 
         rc = ext4fs_node_get_core(rfn, eparent->instance, inode);
         if (rc != EOK) {
-                ext4_directory_iterator_fini(&it);
-                return rc;
-        }
-
-        ext4_directory_iterator_fini(&it);
+                return rc;
+        }
+
+        rc = ext4_directory_destroy_result(&result);
+        if (rc != EOK) {
+                return rc;
+        }
+
         return EOK;
 }