Changeset 903bac0a in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2011-08-19T09:00:38Z (14 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/lib/c/generic/vfs/vfs.c (modified) (10 diffs)

uspace/lib/c/generic/vfs/vfs.c

@@ -51 +51 @@
 #include <assert.h>
 #include <str.h>
-#include <devmap.h>
+#include <loc.h>
 #include <ipc/vfs.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 
 static FIBRIL_MUTEX_INITIALIZE(vfs_mutex);
@@ -142 +142 @@
 }
 
-int mount(const char *fs_name, const char *mp, const char *fqdn,
+int mount(const char *fs_name, const char *mp, const char *fqsn,
     const char *opts, unsigned int flags)
 {
         int null_id = -1;
-        char null[DEVMAP_NAME_MAXLEN];
-        
-        if (str_cmp(fqdn, "") == 0) {
+        char null[LOC_NAME_MAXLEN];
+        
+        if (str_cmp(fqsn, "") == 0) {
                 /* No device specified, create a fresh
                    null/%d device instead */
-                null_id = devmap_null_create();
+                null_id = loc_null_create();
                 
                 if (null_id == -1)
                         return ENOMEM;
                 
-                snprintf(null, DEVMAP_NAME_MAXLEN, "null/%d", null_id);
-                fqdn = null;
-        }
-        
-        devmap_handle_t devmap_handle;
-        int res = devmap_device_get_handle(fqdn, &devmap_handle, flags);
+                snprintf(null, LOC_NAME_MAXLEN, "null/%d", null_id);
+                fqsn = null;
+        }
+        
+        service_id_t service_id;
+        int res = loc_service_get_id(fqsn, &service_id, flags);
         if (res != EOK) {
                 if (null_id != -1)
-                        devmap_null_destroy(null_id);
+                        loc_null_destroy(null_id);
                 
                 return res;
@@ -173 +173 @@
         if (!mpa) {
                 if (null_id != -1)
-                        devmap_null_destroy(null_id);
+                        loc_null_destroy(null_id);
                 
                 return ENOMEM;
@@ -181 +181 @@
 
         sysarg_t rc_orig;
-        aid_t req = async_send_2(exch, VFS_IN_MOUNT, devmap_handle, flags, NULL);
+        aid_t req = async_send_2(exch, VFS_IN_MOUNT, service_id, flags, NULL);
         sysarg_t rc = async_data_write_start(exch, (void *) mpa, mpa_size);
         if (rc != EOK) {
@@ -189 +189 @@
                 
                 if (null_id != -1)
-                        devmap_null_destroy(null_id);
+                        loc_null_destroy(null_id);
                 
                 if (rc_orig == EOK)
@@ -204 +204 @@
                 
                 if (null_id != -1)
-                        devmap_null_destroy(null_id);
+                        loc_null_destroy(null_id);
                 
                 if (rc_orig == EOK)
@@ -219 +219 @@
                 
                 if (null_id != -1)
-                        devmap_null_destroy(null_id);
+                        loc_null_destroy(null_id);
                 
                 if (rc_orig == EOK)
@@ -235 +235 @@
                 
                 if (null_id != -1)
-                        devmap_null_destroy(null_id);
+                        loc_null_destroy(null_id);
                 
                 if (rc_orig == EOK)
@@ -248 +248 @@
         
         if ((rc != EOK) && (null_id != -1))
-                devmap_null_destroy(null_id);
+                loc_null_destroy(null_id);
         
         return (int) rc;
@@ -792 +792 @@
         }
         
-        if (!stat.device) {
+        if (!stat.service) {
                 errno = ENOENT;
                 return NULL;
         }
         
-        return devmap_device_connect(mgmt, stat.device, 0);
+        return loc_service_connect(mgmt, stat.service, 0);
 }