Changeset cf95bc0 in mainline for uspace/srv/fs/tmpfs/tmpfs.h

Timestamp:

2009-05-09T21:56:50Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d4a172b

Parents:

4f46695e

Message:

Streamline TMPFS and fix its design so that it properly supports hardlinks.
libfs operation unlink() is now passed also the name of the component being
unlinked.

File:

• uspace/srv/fs/tmpfs/tmpfs.h (modified) (2 diffs)

uspace/srv/fs/tmpfs/tmpfs.h

@@ -45 +45 @@
 #endif
 
-#define TMPFS_NODE(node)        ((node) ? (tmpfs_dentry_t *)(node)->data : NULL)
+#define TMPFS_NODE(node)        ((node) ? (tmpfs_node_t *)(node)->data : NULL)
 #define FS_NODE(node)           ((node) ? (node)->bp : NULL)
 
@@ -54 +54 @@
 } tmpfs_dentry_type_t;
 
+/* forward declaration */
+struct tmpfs_node;
+
 typedef struct tmpfs_dentry {
+        link_t link;            /**< Linkage for the list of siblings. */
+        struct tmpfs_node *node;/**< Back pointer to TMPFS node. */
+        char *name;             /**< Name of dentry. */
+} tmpfs_dentry_t;
+
+typedef struct tmpfs_node {
         fs_node_t *bp;          /**< Back pointer to the FS node. */
         fs_index_t index;       /**< TMPFS node index. */
         dev_handle_t dev_handle;/**< Device handle. */
-        link_t dh_link;         /**< Dentries hash table link. */
-        struct tmpfs_dentry *sibling;
-        struct tmpfs_dentry *child;
-        hash_table_t names;     /**< All names linking to this TMPFS node. */ 
+        link_t nh_link;         /**< Nodes hash table link. */
         tmpfs_dentry_type_t type;
         unsigned lnkcnt;        /**< Link count. */
         size_t size;            /**< File size if type is TMPFS_FILE. */
         void *data;             /**< File content's if type is TMPFS_FILE. */
-} tmpfs_dentry_t;
+        link_t cs_head;         /**< Head of child's siblings list. */
+} tmpfs_node_t;
 
 extern fs_reg_t tmpfs_reg;