Changeset 903bac0a in mainline for uspace/srv/fs/ext2fs/ext2fs_ops.c

Timestamp:

2011-08-19T09:00:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/srv/fs/ext2fs/ext2fs_ops.c

@@ -42 +42 @@
 #include <libext2.h>
 #include <ipc/services.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 #include <macros.h>
 #include <async.h>
@@ -69 +69 @@
 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;
@@ -85 +85 @@
  * 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 int ext2fs_read_directory(ipc_callid_t, aoff64_t, size_t,
     ext2fs_instance_t *, ext2_inode_ref_t *, size_t *);
@@ -97 +97 @@
  * 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 *);
@@ -112 +112 @@
 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);
 
 /*
@@ -134 +134 @@
         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;
         }
@@ -180 +180 @@
 
 /**
- * Find an instance of filesystem for the given devmap_handle
- */
-int ext2fs_instance_get(devmap_handle_t devmap_handle, ext2fs_instance_t **inst)
-{
-        EXT2FS_DBG("(%" PRIun ", -)", devmap_handle);
+ * Find an instance of filesystem for the given service_id
+ */
+int ext2fs_instance_get(service_id_t service_id, ext2fs_instance_t **inst)
+{
+        EXT2FS_DBG("(%" PRIun ", -)", service_id);
         ext2fs_instance_t *tmp;
         
@@ -198 +198 @@
                 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);
@@ -213 +213 @@
 
 
-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);
 }
 
@@ -289 +289 @@
 
 /** 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;
@@ -317 +317 @@
         /* 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,
         };
@@ -411 +411 @@
 
         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,
         };
@@ -429 +429 @@
 }
 
-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("");
@@ -557 +557 @@
 }
 
-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;
 }
 
@@ -588 +588 @@
  */
 
-static int ext2fs_mounted(devmap_handle_t devmap_handle, const char *opts,
+static int ext2fs_mounted(service_id_t service_id, const char *opts,
    fs_index_t *index, aoff64_t *size, unsigned *lnkcnt)
 {
@@ -610 +610 @@
         
         /* Initialize the filesystem  */
-        rc = ext2_filesystem_init(fs, devmap_handle);
+        rc = ext2_filesystem_init(fs, service_id);
         if (rc != EOK) {
                 free(fs);
@@ -637 +637 @@
         /* Initialize instance */
         link_initialize(&inst->link);
-        inst->devmap_handle = devmap_handle;
+        inst->service_id = service_id;
         inst->filesystem = fs;
         inst->open_nodes_count = 0;
@@ -666 +666 @@
 }
 
-static int ext2fs_unmounted(devmap_handle_t devmap_handle)
+static int ext2fs_unmounted(service_id_t service_id)
 {
         EXT2FS_DBG("");
@@ -672 +672 @@
         int rc;
         
-        rc = ext2fs_instance_get(devmap_handle, &inst);
+        rc = ext2fs_instance_get(service_id, &inst);
         
         if (rc != EOK)
@@ -698 +698 @@
 
 static int
-ext2fs_read(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos,
+ext2fs_read(service_id_t service_id, fs_index_t index, aoff64_t pos,
     size_t *rbytes)
 {
@@ -717 +717 @@
         }
         
-        rc = ext2fs_instance_get(devmap_handle, &inst);
+        rc = ext2fs_instance_get(service_id, &inst);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -907 +907 @@
         
         /* 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);
@@ -925 +925 @@
 
 static int
-ext2fs_write(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t pos,
+ext2fs_write(service_id_t service_id, fs_index_t index, aoff64_t pos,
     size_t *wbytes, aoff64_t *nsize)
 {
@@ -933 +933 @@
 
 static int
-ext2fs_truncate(devmap_handle_t devmap_handle, fs_index_t index, aoff64_t size)
+ext2fs_truncate(service_id_t service_id, fs_index_t index, aoff64_t size)
 {
         EXT2FS_DBG("");
@@ -939 +939 @@
 }
 
-static int ext2fs_close(devmap_handle_t devmap_handle, fs_index_t index)
-{
-        EXT2FS_DBG("");
-        return EOK;
-}
-
-static int ext2fs_destroy(devmap_handle_t devmap_handle, fs_index_t index)
+static int ext2fs_close(service_id_t service_id, fs_index_t index)
+{
+        EXT2FS_DBG("");
+        return EOK;
+}
+
+static int ext2fs_destroy(service_id_t service_id, fs_index_t index)
 {
         EXT2FS_DBG("");
@@ -951 +951 @@
 }
 
-static int ext2fs_sync(devmap_handle_t devmap_handle, fs_index_t index)
+static int ext2fs_sync(service_id_t service_id, fs_index_t index)
 {
         EXT2FS_DBG("");