Changes in uspace/srv/fs/tmpfs/tmpfs_ops.c [efcebe1:b33870b] in mainline

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (25 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -69 +69 @@
 /* Forward declarations of static functions. */
 static int tmpfs_match(fs_node_t **, fs_node_t *, const char *);
-static int tmpfs_node_get(fs_node_t **, devmap_handle_t, fs_index_t);
+static int tmpfs_node_get(fs_node_t **, service_id_t, fs_index_t);
 static int tmpfs_node_open(fs_node_t *);
 static int tmpfs_node_put(fs_node_t *);
-static int tmpfs_create_node(fs_node_t **, devmap_handle_t, int);
+static int tmpfs_create_node(fs_node_t **, service_id_t, int);
 static int tmpfs_destroy_node(fs_node_t *);
 static int tmpfs_link_node(fs_node_t *, fs_node_t *, const char *);
@@ -78 +78 @@
 
 /* Implementation of helper functions. */
-static int tmpfs_root_get(fs_node_t **rfn, devmap_handle_t devmap_handle)
-{
-        return tmpfs_node_get(rfn, devmap_handle, TMPFS_SOME_ROOT); 
+static int tmpfs_root_get(fs_node_t **rfn, service_id_t service_id)
+{
+        return tmpfs_node_get(rfn, service_id, TMPFS_SOME_ROOT); 
 }
 
@@ -114 +114 @@
 }
 
-static devmap_handle_t tmpfs_device_get(fs_node_t *fn)
+static service_id_t tmpfs_service_get(fs_node_t *fn)
 {
         return 0;
@@ -136 +136 @@
         .is_directory = tmpfs_is_directory,
         .is_file = tmpfs_is_file,
-        .device_get = tmpfs_device_get
+        .service_get = tmpfs_service_get
 };
 
@@ -158 +158 @@
         switch (keys) {
         case 1:
-                return (nodep->devmap_handle == key[NODES_KEY_DEV]);
+                return (nodep->service_id == key[NODES_KEY_DEV]);
         case 2: 
-                return ((nodep->devmap_handle == key[NODES_KEY_DEV]) &&
+                return ((nodep->service_id == key[NODES_KEY_DEV]) &&
                     (nodep->index == key[NODES_KEY_INDEX]));
         default:
@@ -202 +202 @@
         nodep->bp = NULL;
         nodep->index = 0;
-        nodep->devmap_handle = 0;
+        nodep->service_id = 0;
         nodep->type = TMPFS_NONE;
         nodep->lnkcnt = 0;
@@ -226 +226 @@
 }
 
-static bool tmpfs_instance_init(devmap_handle_t devmap_handle)
+static bool tmpfs_instance_init(service_id_t service_id)
 {
         fs_node_t *rfn;
         int rc;
         
-        rc = tmpfs_create_node(&rfn, devmap_handle, L_DIRECTORY);
+        rc = tmpfs_create_node(&rfn, service_id, L_DIRECTORY);
         if (rc != EOK || !rfn)
                 return false;
@@ -238 +238 @@
 }
 
-static void tmpfs_instance_done(devmap_handle_t devmap_handle)
-{
-        unsigned long key[] = {
-                [NODES_KEY_DEV] = devmap_handle
+static void tmpfs_instance_done(service_id_t service_id)
+{
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = service_id
         };
         /*
@@ -270 +270 @@
 }
 
-int tmpfs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle, fs_index_t index)
-{
-        unsigned long key[] = {
-                [NODES_KEY_DEV] = devmap_handle,
+int tmpfs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)
+{
+        unsigned long key[] = {
+                [NODES_KEY_DEV] = service_id,
                 [NODES_KEY_INDEX] = index
         };
@@ -299 +299 @@
 }
 
-int tmpfs_create_node(fs_node_t **rfn, devmap_handle_t devmap_handle, int lflag)
+int tmpfs_create_node(fs_node_t **rfn, service_id_t service_id, int lflag)
 {
         fs_node_t *rootfn;
@@ -318 +318 @@
         nodep->bp->data = nodep;        /* link the FS and TMPFS nodes */
 
-        rc = tmpfs_root_get(&rootfn, devmap_handle);
+        rc = tmpfs_root_get(&rootfn, service_id);
         assert(rc == EOK);
         if (!rootfn)
@@ -324 +324 @@
         else
                 nodep->index = tmpfs_next_index++;
-        nodep->devmap_handle = devmap_handle;
+        nodep->service_id = service_id;
         if (lflag & L_DIRECTORY) 
                 nodep->type = TMPFS_DIRECTORY;
@@ -332 +332 @@
         /* Insert the new node into the nodes hash table. */
         unsigned long key[] = {
-                [NODES_KEY_DEV] = nodep->devmap_handle,
+                [NODES_KEY_DEV] = nodep->service_id,
                 [NODES_KEY_INDEX] = nodep->index
         };
@@ -348 +348 @@
 
         unsigned long key[] = {
-                [NODES_KEY_DEV] = nodep->devmap_handle,
+                [NODES_KEY_DEV] = nodep->service_id,
                 [NODES_KEY_INDEX] = nodep->index
         };
@@ -432 +432 @@
 
 static int
-tmpfs_mounted(devmap_handle_t devmap_handle, const char *opts,
+tmpfs_mounted(service_id_t service_id, const char *opts,
     fs_index_t *index, aoff64_t *size, unsigned *lnkcnt)
 {
@@ -439 +439 @@
         
         /* Check if this device is not already mounted. */
-        rc = tmpfs_root_get(&rootfn, devmap_handle);
+        rc = tmpfs_root_get(&rootfn, service_id);
         if ((rc == EOK) && (rootfn)) {
                 (void) tmpfs_node_put(rootfn);
@@ -446 +446 @@
 
         /* Initialize TMPFS instance. */
-        if (!tmpfs_instance_init(devmap_handle))
+        if (!tmpfs_instance_init(service_id))
                 return ENOMEM;
 
-        rc = tmpfs_root_get(&rootfn, devmap_handle);
+        rc = tmpfs_root_get(&rootfn, service_id);
         assert(rc == EOK);
         tmpfs_node_t *rootp = TMPFS_NODE(rootfn);
         if (str_cmp(opts, "restore") == 0) {
-                if (!tmpfs_restore(devmap_handle))
+                if (!tmpfs_restore(service_id))
                         return ELIMIT;
         }
@@ -464 +464 @@
 }
 
-static int tmpfs_unmounted(devmap_handle_t devmap_handle)
-{
-        tmpfs_instance_done(devmap_handle);
-        return EOK;
-}
-
-static int tmpfs_read(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos,
+static int tmpfs_unmounted(service_id_t service_id)
+{
+        tmpfs_instance_done(service_id);
+        return EOK;
+}
+
+static int tmpfs_read(service_id_t service_id, fs_index_t index, aoff64_t pos,
     size_t *rbytes)
 {
@@ -478 +478 @@
         link_t *hlp;
         unsigned long key[] = {
-                [NODES_KEY_DEV] = devmap_handle,
+                [NODES_KEY_DEV] = service_id,
                 [NODES_KEY_INDEX] = index
         };
@@ -532 +532 @@
 
 static int
-tmpfs_write(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos,
+tmpfs_write(service_id_t service_id, fs_index_t index, aoff64_t pos,
     size_t *wbytes, aoff64_t *nsize)
 {
@@ -540 +540 @@
         link_t *hlp;
         unsigned long key[] = {
-                [NODES_KEY_DEV] = devmap_handle,
+                [NODES_KEY_DEV] = service_id,
                 [NODES_KEY_INDEX] = index
         };
@@ -594 +594 @@
 }
 
-static int tmpfs_truncate(devmap_handle_t devmap_handle, fs_index_t index,
+static int tmpfs_truncate(service_id_t service_id, fs_index_t index,
     aoff64_t size)
 {
@@ -601 +601 @@
          */
         unsigned long key[] = {
-                [NODES_KEY_DEV] = devmap_handle,
+                [NODES_KEY_DEV] = service_id,
                 [NODES_KEY_INDEX] = index
         };
@@ -629 +629 @@
 }
 
-static int tmpfs_close(devmap_handle_t devmap_handle, fs_index_t index)
-{
-        return EOK;
-}
-
-static int tmpfs_destroy(devmap_handle_t devmap_handle, fs_index_t index)
+static int tmpfs_close(service_id_t service_id, fs_index_t index)
+{
+        return EOK;
+}
+
+static int tmpfs_destroy(service_id_t service_id, fs_index_t index)
 {
         link_t *hlp;
         unsigned long key[] = {
-                [NODES_KEY_DEV] = devmap_handle,
+                [NODES_KEY_DEV] = service_id,
                 [NODES_KEY_INDEX] = index
         };
@@ -649 +649 @@
 }
 
-static int tmpfs_sync(devmap_handle_t devmap_handle, fs_index_t index)
+static int tmpfs_sync(service_id_t service_id, fs_index_t index)
 {
         /*