Changeset e2abab03 in mainline

Timestamp:

2011-03-09T15:25:38Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

eef306c

Parents:

84226f0

Message:

Split getting instance out of ext2fs_node_get so we don't unncesarily get instance again in ext2fs_match

File:

• uspace/srv/fs/ext2fs/ext2fs_ops.c (modified) (5 diffs)

uspace/srv/fs/ext2fs/ext2fs_ops.c

@@ -71 +71 @@
 } ext2fs_node_t;
 
+/*
+ * Forward declarations of auxiliary functions
+ */
 static int ext2fs_instance_get(devmap_handle_t, ext2fs_instance_t **);
 static void ext2fs_read_directory(ipc_callid_t, ipc_callid_t, aoff64_t,
@@ -77 +80 @@
         size_t, ext2fs_instance_t *, ext2_inode_ref_t *);
 static bool ext2fs_is_dots(const uint8_t *, size_t);
+static int ext2fs_node_get_core(fs_node_t **, ext2fs_instance_t *, fs_index_t);
 
 /*
@@ -203 +207 @@
                         if (name_size == component_size && bcmp(component, &it.current->name,
                                     name_size) == 0) {
-                                // FIXME: this may be done better (give instance as param)
-                                rc = ext2fs_node_get(rfn, eparent->instance->devmap_handle,
+                                rc = ext2fs_node_get_core(rfn, eparent->instance,
                                         it.current->inode);
                                 if (rc != EOK) {
@@ -235 +238 @@
 {
         EXT2FS_DBG("(-,%u,%u)", devmap_handle, index);
+        
+        ext2fs_instance_t *inst = NULL;
+        int rc;
+        
+        rc = ext2fs_instance_get(devmap_handle, &inst);
+        if (rc != EOK) {
+                return rc;
+        }
+        
+        return ext2fs_node_get_core(rfn, inst, index);
+}
+
+int ext2fs_node_get_core(fs_node_t **rfn, ext2fs_instance_t *inst,
+                fs_index_t index)
+{
         int rc;
         fs_node_t *node = NULL;
         ext2fs_node_t *enode = NULL;
-        ext2fs_instance_t *inst = NULL;
+        
         ext2_inode_ref_t *inode_ref = NULL;
 
@@ -250 +268 @@
                 free(enode);
                 return ENOMEM;
-        }
-        
+        }       
         fs_node_initialize(node);
 
-        rc = ext2fs_instance_get(devmap_handle, &inst);
-        if (rc != EOK) {
-                free(enode);
-                free(node);
-                return rc;
-        }
-                
         rc = ext2_filesystem_get_inode_ref(inst->filesystem, index, &inode_ref);
         if (rc != EOK) {