WebSVN – HelenOS – Diff – /trunk/uspace/srv/fs/tmpfs/tmpfs_ops.c

 #define DENTRIES_BUCKETS    256
 #define NAMES_BUCKETS       4
-/*
- * For now, we don't distinguish between different dev_handles/instances. All
+/** All root nodes have index 0. */
+#define TMPFS_SOME_ROOT     0
- * requests resolve to the only instance, rooted in the following variable.
+/** Global counter for assigning node indices. Shared by all instances. */
- */
-static tmpfs_dentry_t *root;
+fs_index_t tmpfs_next_index = 1;
-#define TMPFS_DEV       0   /**< Dummy device handle for TMPFS */
 /*
  * Implementation of the libfs interface.
  */
     return ((tmpfs_dentry_t *) nodep)->child != NULL;
+}
 static void *tmpfs_root_get(dev_handle_t dev_handle)
+{
-    return root;
+    return tmpfs_node_get(dev_handle, TMPFS_SOME_ROOT);
+}
 static char tmpfs_plb_get_char(unsigned pos)
+{
     return tmpfs_reg.plb_ro[pos % PLB_SIZE];
 };
 /** Hash table of all directory entries. */
 hash_table_t dentries;
+#define DENTRIES_KEY_INDEX  0
+#define DENTRIES_KEY_DEV    1
 /* Implementation of hash table interface for the dentries hash table. */
-static hash_index_t dentries_hash(unsigned long *key)
+static hash_index_t dentries_hash(unsigned long key[])
+{
-    return *key % DENTRIES_BUCKETS;
+    return key[DENTRIES_KEY_INDEX] % DENTRIES_BUCKETS;
+}
-static int dentries_compare(unsigned long *key, hash_count_t keys,
+static int dentries_compare(unsigned long key[], hash_count_t keys,
     link_t *item)
+{
     tmpfs_dentry_t *dentry = hash_table_get_instance(item, tmpfs_dentry_t,
         dh_link);
-    return dentry->index == *key;
+    return (dentry->index == key[DENTRIES_KEY_INDEX] &&
+        dentry->dev_handle == key[DENTRIES_KEY_DEV]);
+}
 static void dentries_remove_callback(link_t *item)
+{
+}
     .hash = dentries_hash,
     .compare = dentries_compare,
     .remove_callback = dentries_remove_callback
 };
-fs_index_t tmpfs_next_index = 1;
 typedef struct {
     char *name;
     tmpfs_dentry_t *parent;
     link_t link;
 } tmpfs_name_t;
+}
 static bool tmpfs_dentry_initialize(tmpfs_dentry_t *dentry)
+{
     dentry->index = 0;
+    dentry->dev_handle = 0;
     dentry->sibling = NULL;
     dentry->child = NULL;
     dentry->type = TMPFS_NONE;
     dentry->lnkcnt = 0;
     dentry->size = 0;
     link_initialize(&dentry->dh_link);
     return (bool)hash_table_create(&dentry->names, NAMES_BUCKETS, 1,
         &names_ops);
+}
-static bool tmpfs_init(void)
+bool tmpfs_init(void)
+{
-    if (!hash_table_create(&dentries, DENTRIES_BUCKETS, 1, &dentries_ops))
+    if (!hash_table_create(&dentries, DENTRIES_BUCKETS, 2, &dentries_ops))
         return false;
+    return true;
+}
+static bool tmpfs_instance_init(dev_handle_t dev_handle)
+{
+    tmpfs_dentry_t *root;
-    root = (tmpfs_dentry_t *) tmpfs_create_node(TMPFS_DEV, L_DIRECTORY);
+    root = (tmpfs_dentry_t *) tmpfs_create_node(dev_handle, L_DIRECTORY);
-    if (!root) {
+    if (!root)
-        hash_table_destroy(&dentries);
         return false;
-    }
     root->lnkcnt = 0;   /* FS root is not linked */
     return true;
+}
 /** Compare one component of path to a directory entry.
+}
 void *
 tmpfs_node_get(dev_handle_t dev_handle, fs_index_t index)
+{
-    unsigned long key = index;
+    unsigned long key[] = {
+        [DENTRIES_KEY_INDEX] = index,
+        [DENTRIES_KEY_DEV] = dev_handle
+    };
-    link_t *lnk = hash_table_find(&dentries, &key);
+    link_t *lnk = hash_table_find(&dentries, key);
     if (!lnk)
         return NULL;
     return hash_table_get_instance(lnk, tmpfs_dentry_t, dh_link);
+}
     if (!tmpfs_dentry_initialize(node)) {
         free(node);
         return NULL;
+    }
+    if (!tmpfs_root_get(dev_handle))
+        node->index = TMPFS_SOME_ROOT;
+    else
-    node->index = tmpfs_next_index++;
+        node->index = tmpfs_next_index++;
+    node->dev_handle = dev_handle;
     if (lflag & L_DIRECTORY)
         node->type = TMPFS_DIRECTORY;
     else
         node->type = TMPFS_FILE;
     /* Insert the new node into the dentry hash table. */
-    unsigned long key = node->index;
+    unsigned long key[] = {
+        [DENTRIES_KEY_INDEX] = node->index,
+        [DENTRIES_KEY_DEV] = node->dev_handle
+    };
-    hash_table_insert(&dentries, &key, &node->dh_link);
+    hash_table_insert(&dentries, key, &node->dh_link);
     return (void *) node;
+}
 int tmpfs_link_node(void *prnt, void *chld, const char *nm)
+{
     assert(!dentry->lnkcnt);
     assert(!dentry->child);
     assert(!dentry->sibling);
-    unsigned long key = dentry->index;
+    unsigned long key[] = {
+        [DENTRIES_KEY_INDEX] = dentry->index,
+        [DENTRIES_KEY_DEV] = dentry->dev_handle
+    };
-    hash_table_remove(&dentries, &key, 1);
+    hash_table_remove(&dentries, key, 2);
     hash_table_destroy(&dentry->names);
     if (dentry->type == TMPFS_FILE)
         free(dentry->data);
         free(opts);
         return;
+    }
     opts[size] = '\0';
-    /* Initialize TMPFS. */
+    /* Initialize TMPFS instance. */
-    if (!root && !tmpfs_init()) {
+    if (!tmpfs_instance_init(dev_handle)) {
         ipc_answer_0(rid, ENOMEM);
         return;
+    }
+    tmpfs_dentry_t *root = tmpfs_root_get(dev_handle);
     if (str_cmp(opts, "restore") == 0) {
         if (tmpfs_restore(dev_handle))
             ipc_answer_3(rid, EOK, root->index, root->size,
                 root->lnkcnt);
         else
     /*
      * Lookup the respective dentry.
      */
     link_t *hlp;
-    unsigned long key = index;
+    unsigned long key[] = {
+        [DENTRIES_KEY_INDEX] = index,
+        [DENTRIES_KEY_DEV] = dev_handle,
+    };
-    hlp = hash_table_find(&dentries, &key);
+    hlp = hash_table_find(&dentries, key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
+    }
     tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
     /*
      * Lookup the respective dentry.
      */
     link_t *hlp;
-    unsigned long key = index;
+    unsigned long key[] = {
+        [DENTRIES_KEY_INDEX] = index,
+        [DENTRIES_KEY_DEV] = dev_handle
+    };
-    hlp = hash_table_find(&dentries, &key);
+    hlp = hash_table_find(&dentries, key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
+    }
     tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
     /*
      * Lookup the respective dentry.
      */
     link_t *hlp;
-    unsigned long key = index;
+    unsigned long key[] = {
+        [DENTRIES_KEY_INDEX] = index,
+        [DENTRIES_KEY_DEV] = dev_handle
+    };
-    hlp = hash_table_find(&dentries, &key);
+    hlp = hash_table_find(&dentries, key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
+    }
     tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,
     dev_handle_t dev_handle = (dev_handle_t)IPC_GET_ARG1(*request);
     fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
     int rc;
     link_t *hlp;
-    unsigned long key = index;
+    unsigned long key[] = {
+        [DENTRIES_KEY_INDEX] = index,
+        [DENTRIES_KEY_DEV] = dev_handle
+    };
-    hlp = hash_table_find(&dentries, &key);
+    hlp = hash_table_find(&dentries, key);
     if (!hlp) {
         ipc_answer_0(rid, ENOENT);
         return;
+    }
     tmpfs_dentry_t *dentry = hash_table_get_instance(hlp, tmpfs_dentry_t,

Subversion Repositories HelenOS

(root)/trunk/uspace/srv/fs/tmpfs/tmpfs_ops.c – Rev 4305 → 4306