Changeset adb5fe3 in mainline

Timestamp:

2008-11-09T21:24:59Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b24786a

Parents:

9a3d5f0

Message:

libfs create operation should take the device handle as argument.

Location:

uspace

Files:

• lib/libfs/libfs.c (modified) (2 diffs)
• lib/libfs/libfs.h (modified) (1 diff)
• srv/fs/fat/fat_ops.c (modified) (1 diff)
• srv/fs/tmpfs/tmpfs_dump.c (modified) (2 diffs)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (4 diffs)

uspace/lib/libfs/libfs.c

@@ -192 +192 @@
                                 void *nodep;
                                 if (lflag & L_CREATE)
-                                        nodep = ops->create(lflag);
+                                        nodep = ops->create(dev_handle, lflag);
                                 else
                                         nodep = ops->node_get(dev_handle,
@@ -263 +263 @@
                         void *nodep;
                         if (lflag & L_CREATE)
-                                nodep = ops->create(lflag);
+                                nodep = ops->create(dev_handle, lflag);
                         else
                                 nodep = ops->node_get(dev_handle, index);

uspace/lib/libfs/libfs.h

@@ -46 +46 @@
         void * (* node_get)(dev_handle_t, fs_index_t);
         void (* node_put)(void *);
-        void * (* create)(int);
+        void * (* create)(dev_handle_t, int);
         int (* destroy)(void *);
         bool (* link)(void *, void *, const char *);

uspace/srv/fs/fat/fat_ops.c

@@ -245 +245 @@
 }
 
-static void *fat_create(int flags)
+static void *fat_create(dev_handle_t dev_handle, int flags)
 {
         return NULL;    /* not supported at the moment */

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -80 +80 @@
                                 return false;
                         
-                        node = (tmpfs_dentry_t *) ops->create(L_FILE);
+                        node = (tmpfs_dentry_t *) ops->create(dev, L_FILE);
                         if (node == NULL) {
                                 free(fname);
@@ -122 +122 @@
                                 return false;
                         
-                        node = (tmpfs_dentry_t *) ops->create(L_DIRECTORY);
+                        node = (tmpfs_dentry_t *) ops->create(dev, L_DIRECTORY);
                         if (node == NULL) {
                                 free(fname);

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -65 +65 @@
 static tmpfs_dentry_t *root;
 
+#define TMPFS_DEV               0       /**< Dummy device handle for TMPFS */
+
 /*
  * Implementation of the libfs interface.
@@ -73 +75 @@
 static void *tmpfs_node_get(dev_handle_t, fs_index_t);
 static void tmpfs_node_put(void *);
-static void *tmpfs_create_node(int);
+static void *tmpfs_create_node(dev_handle_t, int);
 static bool tmpfs_link_node(void *, void *, const char *);
 static int tmpfs_unlink_node(void *, void *);
@@ -229 +231 @@
         if (!hash_table_create(&dentries, DENTRIES_BUCKETS, 1, &dentries_ops))
                 return false;
-        root = (tmpfs_dentry_t *) tmpfs_create_node(L_DIRECTORY);
+        root = (tmpfs_dentry_t *) tmpfs_create_node(TMPFS_DEV, L_DIRECTORY);
         if (!root) {
                 hash_table_destroy(&dentries);
@@ -283 +285 @@
 }
 
-void *tmpfs_create_node(int lflag)
+void *tmpfs_create_node(dev_handle_t dev_handle, int lflag)
 {
         assert((lflag & L_FILE) ^ (lflag & L_DIRECTORY));