Changeset 15f3c3f in mainline for uspace/srv/fs/ext2fs/ext2fs_ops.c

Timestamp:

2011-06-22T22:00:52Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

86ffa27f

Parents:

ef09a7a

Message:

Rename devmap to loc, devfs to locfs.

File:

• uspace/srv/fs/ext2fs/ext2fs_ops.c (modified) (25 diffs)

uspace/srv/fs/ext2fs/ext2fs_ops.c

@@ -43 +43 @@
 #include <libext2.h>
 #include <ipc/services.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 #include <macros.h>
 #include <async.h>
@@ -70 +70 @@
 typedef struct ext2fs_instance {
         link_t link;
-        devmap_handle_t devmap_handle;
+        service_id_t service_id;
         ext2_filesystem_t *filesystem;
         unsigned int open_nodes_count;
@@ -86 +86 @@
  * Forward declarations of auxiliary functions
  */
-static int ext2fs_instance_get(devmap_handle_t, ext2fs_instance_t **);
+static int ext2fs_instance_get(service_id_t, ext2fs_instance_t **);
 static void ext2fs_read_directory(ipc_callid_t, ipc_callid_t, aoff64_t,
         size_t, ext2fs_instance_t *, ext2_inode_ref_t *);
@@ -98 +98 @@
  * Forward declarations of EXT2 libfs operations.
  */
-static int ext2fs_root_get(fs_node_t **, devmap_handle_t);
+static int ext2fs_root_get(fs_node_t **, service_id_t);
 static int ext2fs_match(fs_node_t **, fs_node_t *, const char *);
-static int ext2fs_node_get(fs_node_t **, devmap_handle_t, fs_index_t);
+static int ext2fs_node_get(fs_node_t **, service_id_t, fs_index_t);
 static int ext2fs_node_open(fs_node_t *);
 static int ext2fs_node_put(fs_node_t *);
-static int ext2fs_create_node(fs_node_t **, devmap_handle_t, int);
+static int ext2fs_create_node(fs_node_t **, service_id_t, int);
 static int ext2fs_destroy_node(fs_node_t *);
 static int ext2fs_link(fs_node_t *, fs_node_t *, const char *);
@@ -114 +114 @@
 static bool ext2fs_is_directory(fs_node_t *);
 static bool ext2fs_is_file(fs_node_t *node);
-static devmap_handle_t ext2fs_device_get(fs_node_t *node);
+static service_id_t ext2fs_device_get(fs_node_t *node);
 
 /*
@@ -136 +136 @@
         ext2fs_node_t *enode = hash_table_get_instance(item, ext2fs_node_t, link);
         assert(keys > 0);
-        if (enode->instance->devmap_handle !=
-            ((devmap_handle_t) key[OPEN_NODES_DEV_HANDLE_KEY])) {
+        if (enode->instance->service_id !=
+            ((service_id_t) key[OPEN_NODES_DEV_HANDLE_KEY])) {
                 return false;
         }
@@ -182 +182 @@
 
 /**
- * Find an instance of filesystem for the given devmap_handle
+ * Find an instance of filesystem for the given service_id
  */
-int ext2fs_instance_get(devmap_handle_t devmap_handle, ext2fs_instance_t **inst)
-{
-        EXT2FS_DBG("(%" PRIun ", -)", devmap_handle);
+int ext2fs_instance_get(service_id_t service_id, ext2fs_instance_t **inst)
+{
+        EXT2FS_DBG("(%" PRIun ", -)", service_id);
         ext2fs_instance_t *tmp;
         
@@ -200 +200 @@
                 tmp = list_get_instance(link, ext2fs_instance_t, link);
                 
-                if (tmp->devmap_handle == devmap_handle) {
+                if (tmp->service_id == service_id) {
                         *inst = tmp;
                         fibril_mutex_unlock(&instance_list_mutex);
@@ -215 +215 @@
 
 
-int ext2fs_root_get(fs_node_t **rfn, devmap_handle_t devmap_handle)
-{
-        EXT2FS_DBG("(-, %" PRIun ")", devmap_handle);
-        return ext2fs_node_get(rfn, devmap_handle, EXT2_INODE_ROOT_INDEX);
+int ext2fs_root_get(fs_node_t **rfn, service_id_t service_id)
+{
+        EXT2FS_DBG("(-, %" PRIun ")", service_id);
+        return ext2fs_node_get(rfn, service_id, EXT2_INODE_ROOT_INDEX);
 }
 
@@ -291 +291 @@
 
 /** Instantiate a EXT2 in-core node. */
-int ext2fs_node_get(fs_node_t **rfn, devmap_handle_t devmap_handle, fs_index_t index)
-{
-        EXT2FS_DBG("(-,%" PRIun ",%u)", devmap_handle, index);
+int ext2fs_node_get(fs_node_t **rfn, service_id_t service_id, fs_index_t index)
+{
+        EXT2FS_DBG("(-,%" PRIun ",%u)", service_id, index);
         
         ext2fs_instance_t *inst = NULL;
         int rc;
         
-        rc = ext2fs_instance_get(devmap_handle, &inst);
+        rc = ext2fs_instance_get(service_id, &inst);
         if (rc != EOK) {
                 return rc;
@@ -319 +319 @@
         /* Check if the node is not already open */
         unsigned long key[] = {
-                [OPEN_NODES_DEV_HANDLE_KEY] = inst->devmap_handle,
+                [OPEN_NODES_DEV_HANDLE_KEY] = inst->service_id,
                 [OPEN_NODES_INODE_KEY] = index,
         };
@@ -413 +413 @@
 
         unsigned long key[] = {
-                [OPEN_NODES_DEV_HANDLE_KEY] = enode->instance->devmap_handle,
+                [OPEN_NODES_DEV_HANDLE_KEY] = enode->instance->service_id,
                 [OPEN_NODES_INODE_KEY] = enode->inode_ref->index,
         };
@@ -431 +431 @@
 }
 
-int ext2fs_create_node(fs_node_t **rfn, devmap_handle_t devmap_handle, int flags)
+int ext2fs_create_node(fs_node_t **rfn, service_id_t service_id, int flags)
 {
         EXT2FS_DBG("");
@@ -564 +564 @@
 }
 
-devmap_handle_t ext2fs_device_get(fs_node_t *fn)
+service_id_t ext2fs_device_get(fs_node_t *fn)
 {
         EXT2FS_DBG("");
         ext2fs_node_t *enode = EXT2FS_NODE(fn);
-        return enode->instance->devmap_handle;
+        return enode->instance->service_id;
 }
 
@@ -600 +600 @@
         EXT2FS_DBG("");
         int rc;
-        devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
+        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
         ext2_filesystem_t *fs;
         ext2fs_instance_t *inst;
@@ -632 +632 @@
         
         /* Initialize the filesystem  */
-        rc = ext2_filesystem_init(fs, devmap_handle);
+        rc = ext2_filesystem_init(fs, service_id);
         if (rc != EOK) {
                 free(fs);
@@ -662 +662 @@
         /* Initialize instance */
         link_initialize(&inst->link);
-        inst->devmap_handle = devmap_handle;
+        inst->service_id = service_id;
         inst->filesystem = fs;
         inst->open_nodes_count = 0;
@@ -700 +700 @@
 {
         EXT2FS_DBG("");
-        devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
+        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
         ext2fs_instance_t *inst;
         int rc;
         
-        rc = ext2fs_instance_get(devmap_handle, &inst);
+        rc = ext2fs_instance_get(service_id, &inst);
         
         if (rc != EOK) {
@@ -747 +747 @@
 {
         EXT2FS_DBG("");
-        devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
+        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
         aoff64_t pos =
@@ -767 +767 @@
         }
         
-        rc = ext2fs_instance_get(devmap_handle, &inst);
+        rc = ext2fs_instance_get(service_id, &inst);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -965 +965 @@
         
         /* Usual case - we need to read a block from device */
-        rc = block_get(&block, inst->devmap_handle, fs_block, BLOCK_FLAGS_NONE);
+        rc = block_get(&block, inst->service_id, fs_block, BLOCK_FLAGS_NONE);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -987 +987 @@
 {
         EXT2FS_DBG("");
-//      devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
+//      service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
 //      fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
 //      aoff64_t pos =
@@ -999 +999 @@
 {
         EXT2FS_DBG("");
-//      devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
+//      service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
 //      fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
 //      aoff64_t size =
@@ -1017 +1017 @@
 {
         EXT2FS_DBG("");
-//      devmap_handle_t devmap_handle = (devmap_handle_t)IPC_GET_ARG1(*request);
+//      service_id_t service_id = (service_id_t)IPC_GET_ARG1(*request);
 //      fs_index_t index = (fs_index_t)IPC_GET_ARG2(*request);
         
@@ -1039 +1039 @@
 {
         EXT2FS_DBG("");
-//      devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
+//      service_id_t service_id = (service_id_t) IPC_GET_ARG1(*request);
 //      fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);