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

Timestamp:

2011-10-04T12:18:44Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

a23297c

Parents:

01ab41b

Message:

part of code needed for successful mount (porting from ext2)

File:

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

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -41 +41 @@
 #include <libfs.h>
 #include <malloc.h>
+#include <stdio.h>
 #include <ipc/loc.h>
 #include "ext4fs.h"
@@ -46 +47 @@
 
 #define EXT4FS_NODE(node)       ((node) ? (ext4fs_node_t *) (node)->data : NULL)
+#define EXT4FS_DBG(format, ...) {if (true) printf("ext4fs: %s: " format "\n", __FUNCTION__, ##__VA_ARGS__);}
 
 typedef struct ext4fs_instance {
@@ -67 +69 @@
 static int ext4fs_instance_get(service_id_t, ext4fs_instance_t **);
 static int ext4fs_node_get_core(fs_node_t **, ext4fs_instance_t *, fs_index_t);
-
+static int ext4fs_node_put_core(ext4fs_node_t *);
 
 /*
@@ -120 +122 @@
  */
 
+/**
+ * TODO doxy
+ */
 int ext4fs_instance_get(service_id_t service_id, ext4fs_instance_t **inst)
 {
@@ -145 +150 @@
 }
 
+/**
+ * TODO doxy
+ */
 int ext4fs_root_get(fs_node_t **rfn, service_id_t service_id)
 {
@@ -150 +158 @@
 }
 
+/**
+ * TODO doxy
+ */
 int ext4fs_match(fs_node_t **rfn, fs_node_t *pfn, const char *component)
 {
@@ -156 +167 @@
 }
 
+/**
+ * TODO doxy
+ */
 int ext4fs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)
 {
-        // TODO
-        return 0;
-}
-
+        ext4fs_instance_t *inst = NULL;
+        int rc;
+
+        rc = ext4fs_instance_get(service_id, &inst);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        return ext4fs_node_get_core(rfn, inst, index);
+}
+
+/**
+ * TODO doxy
+ */
 int ext4fs_node_get_core(fs_node_t **rfn, ext4fs_instance_t *inst,
                 fs_index_t index)
@@ -172 +196 @@
  * TODO doxy
  */
+int ext4fs_node_put_core(ext4fs_node_t *enode) {
+        // TODO
+        return EOK;
+}
+
+/**
+ * TODO doxy
+ */
 int ext4fs_node_open(fs_node_t *fn)
 {
@@ -180 +212 @@
 int ext4fs_node_put(fs_node_t *fn)
 {
-        // TODO
+        EXT4FS_DBG("");
+        int rc;
+        ext4fs_node_t *enode = EXT4FS_NODE(fn);
+
+        fibril_mutex_lock(&open_nodes_lock);
+
+        assert(enode->references > 0);
+        enode->references--;
+        if (enode->references == 0) {
+                rc = ext4fs_node_put_core(enode);
+                if (rc != EOK) {
+                        fibril_mutex_unlock(&open_nodes_lock);
+                        return rc;
+                }
+        }
+
+        fibril_mutex_unlock(&open_nodes_lock);
+
         return EOK;
 }
@@ -278 +327 @@
  */
 
+/**
+ * TODO doxy
+ */
 static int ext4fs_mounted(service_id_t service_id, const char *opts,
    fs_index_t *index, aoff64_t *size, unsigned *lnkcnt)
 {
+
+        EXT4FS_DBG("Mounting...");
 
         int rc;
@@ -300 +354 @@
         }
 
-        /* Initialize the filesystem  */
+        EXT4FS_DBG("Basic structures allocated");
+
+        /* Initialize the filesystem */
         rc = ext4_filesystem_init(fs, service_id);
         if (rc != EOK) {
@@ -307 +363 @@
                 return rc;
         }
+
+        EXT4FS_DBG("initialized");
 
         /* Do some sanity checking */
@@ -317 +375 @@
         }
 
+        EXT4FS_DBG("Checked and clean");
+
         /* Check flags */
-        rc = ext4_filesystem_check_flags(fs, &read_only);
+        rc = ext4_filesystem_check_features(fs, &read_only);
         if (rc != EOK) {
                 ext4_filesystem_fini(fs);
@@ -326 +386 @@
         }
 
+        EXT4FS_DBG("Features checked");
+
         /* Initialize instance */
         link_initialize(&inst->link);
@@ -332 +394 @@
         inst->open_nodes_count = 0;
 
+        EXT4FS_DBG("Instance initialized");
+
         /* Read root node */
         fs_node_t *root_node;
-        rc = ext4fs_node_get_core(&root_node, inst, EXT4_INODE_ROOT_INDEX);
+        rc = ext4fs_root_get(&root_node, inst->service_id);
         if (rc != EOK) {
                 ext4_filesystem_fini(fs);
@@ -343 +407 @@
         ext4fs_node_t *enode = EXT4FS_NODE(root_node);
 
+        EXT4FS_DBG("Root node found");
+
         /* Add instance to the list */
         fibril_mutex_lock(&instance_list_mutex);
@@ -348 +414 @@
         fibril_mutex_unlock(&instance_list_mutex);
 
+        EXT4FS_DBG("Instance added");
+
         *index = EXT4_INODE_ROOT_INDEX;
         *size = 0;
         *lnkcnt = ext4_inode_get_usage_count(enode->inode_ref->inode);
 
+        EXT4FS_DBG("Return values set");
+
         ext4fs_node_put(root_node);
 
-        return EOK;
-}
-
+        EXT4FS_DBG("Mounting finished");
+
+        return EOK;
+}
+
+/**
+ * TODO doxy
+ */
 static int ext4fs_unmounted(service_id_t service_id)
 {
@@ -388 +463 @@
 }
 
+/**
+ * TODO doxy
+ */
 static int
 ext4fs_read(service_id_t service_id, fs_index_t index, aoff64_t pos,
@@ -396 +474 @@
 }
 
+/**
+ * TODO doxy
+ */
 static int
 ext4fs_write(service_id_t service_id, fs_index_t index, aoff64_t pos,
@@ -404 +485 @@
 }
 
+/**
+ * TODO doxy
+ */
 static int
 ext4fs_truncate(service_id_t service_id, fs_index_t index, aoff64_t size)
@@ -411 +495 @@
 }
 
+/**
+ * TODO doxy
+ */
 static int ext4fs_close(service_id_t service_id, fs_index_t index)
 {
@@ -417 +504 @@
 }
 
+/**
+ * TODO doxy
+ */
 static int ext4fs_destroy(service_id_t service_id, fs_index_t index)
 {
@@ -423 +513 @@
 }
 
+/**
+ * TODO doxy
+ */
 static int ext4fs_sync(service_id_t service_id, fs_index_t index)
 {