Changeset 9a3d5f0 in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2008-11-09T21:13:30Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

adb5fe3

Parents:

ac49f5d1

Message:

Move common code to dedicated functions so that it can be easily reused.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (2 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -103 +103 @@
 }
 
-/** Internal version of fat_node_get().
- *
- * @param idxp          Locked index structure.
- */
-static void *fat_node_get_core(fat_idx_t *idxp)
-{
-        block_t *b;
-        fat_bs_t *bs;
-        fat_dentry_t *d;
-        fat_node_t *nodep = NULL;
-        unsigned bps;
-        unsigned spc;
-        unsigned dps;
-
-        if (idxp->nodep) {
-                /*
-                 * We are lucky.
-                 * The node is already instantiated in memory.
-                 */
-                futex_down(&idxp->nodep->lock);
-                if (!idxp->nodep->refcnt++)
-                        list_remove(&idxp->nodep->ffn_link);
-                futex_up(&idxp->nodep->lock);
-                return idxp->nodep;
-        }
-
-        /*
-         * We must instantiate the node from the file system.
-         */
-        
-        assert(idxp->pfc);
+static fat_node_t *fat_node_get_new(void)
+{
+        fat_node_t *nodep;
 
         futex_down(&ffn_futex);
@@ -163 +135 @@
         }
         fat_node_initialize(nodep);
+        
+        return nodep;
+}
+
+/** Internal version of fat_node_get().
+ *
+ * @param idxp          Locked index structure.
+ */
+static void *fat_node_get_core(fat_idx_t *idxp)
+{
+        block_t *b;
+        fat_bs_t *bs;
+        fat_dentry_t *d;
+        fat_node_t *nodep = NULL;
+        unsigned bps;
+        unsigned spc;
+        unsigned dps;
+
+        if (idxp->nodep) {
+                /*
+                 * We are lucky.
+                 * The node is already instantiated in memory.
+                 */
+                futex_down(&idxp->nodep->lock);
+                if (!idxp->nodep->refcnt++)
+                        list_remove(&idxp->nodep->ffn_link);
+                futex_up(&idxp->nodep->lock);
+                return idxp->nodep;
+        }
+
+        /*
+         * We must instantiate the node from the file system.
+         */
+        
+        assert(idxp->pfc);
+
+        nodep = fat_node_get_new();
+        if (!nodep)
+                return NULL;
 
         bs = block_bb_get(idxp->dev_handle);