Changes in uspace/lib/c/generic/vfs/vfs.c [9ea7d90:79ae36dd] in mainline

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (16 diffs)

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

@@ -51 +51 @@
 #include <assert.h>
 #include <str.h>
-#include <loc.h>
+#include <devmap.h>
 #include <ipc/vfs.h>
-#include <ipc/loc.h>
+#include <ipc/devmap.h>
 
 static FIBRIL_MUTEX_INITIALIZE(vfs_mutex);
@@ -69 +69 @@
  *
  */
-async_exch_t *vfs_exchange_begin(void)
+static async_exch_t *vfs_exchange_begin(void)
 {
         fibril_mutex_lock(&vfs_mutex);
@@ -87 +87 @@
  *
  */
-void vfs_exchange_end(async_exch_t *exch)
+static void vfs_exchange_end(async_exch_t *exch)
 {
         async_exchange_end(exch);
@@ -142 +142 @@
 }
 
-int mount(const char *fs_name, const char *mp, const char *fqsn,
+int mount(const char *fs_name, const char *mp, const char *fqdn,
     const char *opts, unsigned int flags)
 {
         int null_id = -1;
-        char null[LOC_NAME_MAXLEN];
-        
-        if (str_cmp(fqsn, "") == 0) {
+        char null[DEVMAP_NAME_MAXLEN];
+        
+        if (str_cmp(fqdn, "") == 0) {
                 /* No device specified, create a fresh
                    null/%d device instead */
-                null_id = loc_null_create();
+                null_id = devmap_null_create();
                 
                 if (null_id == -1)
                         return ENOMEM;
                 
-                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);
+                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);
         if (res != EOK) {
                 if (null_id != -1)
-                        loc_null_destroy(null_id);
+                        devmap_null_destroy(null_id);
                 
                 return res;
@@ -173 +173 @@
         if (!mpa) {
                 if (null_id != -1)
-                        loc_null_destroy(null_id);
+                        devmap_null_destroy(null_id);
                 
                 return ENOMEM;
@@ -181 +181 @@
 
         sysarg_t rc_orig;
-        aid_t req = async_send_2(exch, VFS_IN_MOUNT, service_id, flags, NULL);
+        aid_t req = async_send_2(exch, VFS_IN_MOUNT, devmap_handle, flags, NULL);
         sysarg_t rc = async_data_write_start(exch, (void *) mpa, mpa_size);
         if (rc != EOK) {
@@ -189 +189 @@
                 
                 if (null_id != -1)
-                        loc_null_destroy(null_id);
+                        devmap_null_destroy(null_id);
                 
                 if (rc_orig == EOK)
@@ -204 +204 @@
                 
                 if (null_id != -1)
-                        loc_null_destroy(null_id);
+                        devmap_null_destroy(null_id);
                 
                 if (rc_orig == EOK)
@@ -219 +219 @@
                 
                 if (null_id != -1)
-                        loc_null_destroy(null_id);
+                        devmap_null_destroy(null_id);
                 
                 if (rc_orig == EOK)
@@ -235 +235 @@
                 
                 if (null_id != -1)
-                        loc_null_destroy(null_id);
+                        devmap_null_destroy(null_id);
                 
                 if (rc_orig == EOK)
@@ -248 +248 @@
         
         if ((rc != EOK) && (null_id != -1))
-                loc_null_destroy(null_id);
+                devmap_null_destroy(null_id);
         
         return (int) rc;
@@ -329 +329 @@
 }
 
+int open_node(fdi_node_t *node, int oflag)
+{
+        async_exch_t *exch = vfs_exchange_begin();
+        
+        ipc_call_t answer;
+        aid_t req = async_send_4(exch, VFS_IN_OPEN_NODE, node->fs_handle,
+            node->devmap_handle, node->index, oflag, &answer);
+        
+        vfs_exchange_end(exch);
+
+        sysarg_t rc;
+        async_wait_for(req, &rc);
+        
+        if (rc != EOK)
+                return (int) rc;
+        
+        return (int) IPC_GET_ARG1(answer);
+}
+
 int close(int fildes)
 {
@@ -396 +415 @@
         else
                 return -1;
-}
-
-/** Read entire buffer.
- *
- * In face of short reads this function continues reading until either
- * the entire buffer is read or no more data is available (at end of file).
- *
- * @param fildes        File descriptor
- * @param buf           Buffer, @a nbytes bytes long
- * @param nbytes        Number of bytes to read
- *
- * @return              On success, positive number of bytes read.
- *                      On failure, negative error code from read().
- */
-ssize_t read_all(int fildes, void *buf, size_t nbyte)
-{
-        ssize_t cnt = 0;
-        size_t nread = 0;
-        uint8_t *bp = (uint8_t *) buf;
-
-        do {
-                bp += cnt;
-                nread += cnt;
-                cnt = read(fildes, bp, nbyte - nread);
-        } while (cnt > 0 && (nbyte - nread - cnt) > 0);
-
-        if (cnt < 0)
-                return cnt;
-
-        return nread + cnt;
-}
-
-/** Write entire buffer.
- *
- * This function fails if it cannot write exactly @a len bytes to the file.
- *
- * @param fildes        File descriptor
- * @param buf           Data, @a nbytes bytes long
- * @param nbytes        Number of bytes to write
- *
- * @return              EOK on error, return value from write() if writing
- *                      failed.
- */
-ssize_t write_all(int fildes, const void *buf, size_t nbyte)
-{
-        ssize_t cnt = 0;
-        ssize_t nwritten = 0;
-        const uint8_t *bp = (uint8_t *) buf;
-
-        do {
-                bp += cnt;
-                nwritten += cnt;
-                cnt = write(fildes, bp, nbyte - nwritten);
-        } while (cnt > 0 && ((ssize_t )nbyte - nwritten - cnt) > 0);
-
-        if (cnt < 0)
-                return cnt;
-
-        if ((ssize_t)nbyte - nwritten - cnt > 0)
-                return EIO;
-
-        return nbyte;
 }
 
@@ -654 +611 @@
         async_exch_t *exch = vfs_exchange_begin();
         
-        req = async_send_1(exch, VFS_IN_UNLINK, lflag, NULL);
+        req = async_send_0(exch, VFS_IN_UNLINK, NULL);
         rc = async_data_write_start(exch, pa, pa_size);
         if (rc != EOK) {
@@ -792 +749 @@
         }
         
-        if (!stat.service) {
+        if (!stat.device) {
                 errno = ENOENT;
                 return NULL;
         }
         
-        return loc_service_connect(mgmt, stat.service, 0);
+        return devmap_device_connect(mgmt, stat.device, 0);
+}
+
+int fd_node(int fildes, fdi_node_t *node)
+{
+        struct stat stat;
+        int rc = fstat(fildes, &stat);
+        
+        if (rc == EOK) {
+                node->fs_handle = stat.fs_handle;
+                node->devmap_handle = stat.devmap_handle;
+                node->index = stat.index;
+        }
+        
+        return rc;
 }
 
@@ -815 +786 @@
 }
 
-int fd_wait(void)
-{
-        async_exch_t *exch = vfs_exchange_begin();
-        
-        sysarg_t ret;
-        sysarg_t rc = async_req_0_1(exch, VFS_IN_WAIT_HANDLE, &ret);
-        
-        vfs_exchange_end(exch);
-        
-        if (rc == EOK)
-                return (int) ret;
-        
-        return (int) rc;
-}
-
 /** @}
  */