Changeset 5cde90f in mainline for uspace/lib/libc/generic/vfs/vfs.c

Timestamp:

2010-02-19T17:16:46Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

617652f

Parents:

b86d436 (diff), f41aa81 (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:

Synchronizing with head (which has just been synchronized with this branch).

File:

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

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

@@ -35 +35 @@
 #include <vfs/vfs.h>
 #include <vfs/canonify.h>
+#include <macros.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -120 +121 @@
     const char *opts, unsigned int flags)
 {
-        int res;
+        int null_id = -1;
+        char null[DEVMAP_NAME_MAXLEN];
+        
+        if (str_cmp(fqdn, "") == 0) {
+                /* No device specified, create a fresh
+                   null/%d device instead */
+                null_id = devmap_null_create();
+                
+                if (null_id == -1)
+                        return ENOMEM;
+                
+                snprintf(null, DEVMAP_NAME_MAXLEN, "null/%d", null_id);
+                fqdn = null;
+        }
+        
+        dev_handle_t dev_handle;
+        int res = devmap_device_get_handle(fqdn, &dev_handle, flags);
+        if (res != EOK) {
+                if (null_id != -1)
+                        devmap_null_destroy(null_id);
+                
+                return res;
+        }
+        
+        size_t mpa_size;
+        char *mpa = absolutize(mp, &mpa_size);
+        if (!mpa) {
+                if (null_id != -1)
+                        devmap_null_destroy(null_id);
+                
+                return ENOMEM;
+        }
+        
+        futex_down(&vfs_phone_futex);
+        async_serialize_start();
+        vfs_connect();
+        
+        ipcarg_t rc_orig;
+        aid_t req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
+        ipcarg_t rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
+        if (rc != EOK) {
+                async_wait_for(req, &rc_orig);
+                async_serialize_end();
+                futex_up(&vfs_phone_futex);
+                free(mpa);
+                
+                if (null_id != -1)
+                        devmap_null_destroy(null_id);
+                
+                if (rc_orig == EOK)
+                        return (int) rc;
+                else
+                        return (int) rc_orig;
+        }
+        
+        rc = async_data_write_start(vfs_phone, (void *) opts, str_size(opts));
+        if (rc != EOK) {
+                async_wait_for(req, &rc_orig);
+                async_serialize_end();
+                futex_up(&vfs_phone_futex);
+                free(mpa);
+                
+                if (null_id != -1)
+                        devmap_null_destroy(null_id);
+                
+                if (rc_orig == EOK)
+                        return (int) rc;
+                else
+                        return (int) rc_orig;
+        }
+        
+        rc = async_data_write_start(vfs_phone, (void *) fs_name, str_size(fs_name));
+        if (rc != EOK) {
+                async_wait_for(req, &rc_orig);
+                async_serialize_end();
+                futex_up(&vfs_phone_futex);
+                free(mpa);
+                
+                if (null_id != -1)
+                        devmap_null_destroy(null_id);
+                
+                if (rc_orig == EOK)
+                        return (int) rc;
+                else
+                        return (int) rc_orig;
+        }
+        
+        /* Ask VFS whether it likes fs_name. */
+        rc = async_req_0_0(vfs_phone, IPC_M_PING);
+        if (rc != EOK) {
+                async_wait_for(req, &rc_orig);
+                async_serialize_end();
+                futex_up(&vfs_phone_futex);
+                free(mpa);
+                
+                if (null_id != -1)
+                        devmap_null_destroy(null_id);
+                
+                if (rc_orig == EOK)
+                        return (int) rc;
+                else
+                        return (int) rc_orig;
+        }
+        
+        async_wait_for(req, &rc);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        free(mpa);
+        
+        if ((rc != EOK) && (null_id != -1))
+                devmap_null_destroy(null_id);
+        
+        return (int) rc;
+}
+
+int unmount(const char *mp)
+{
         ipcarg_t rc;
         ipcarg_t rc_orig;
         aid_t req;
-        dev_handle_t dev_handle;
-        
-        res = devmap_device_get_handle(fqdn, &dev_handle, flags);
-        if (res != EOK)
-                return res;
-        
         size_t mpa_size;
-        char *mpa = absolutize(mp, &mpa_size);
+        char *mpa;
+        
+        mpa = absolutize(mp, &mpa_size);
         if (!mpa)
                 return ENOMEM;
@@ -139 +252 @@
         vfs_connect();
         
-        req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
+        req = async_send_0(vfs_phone, VFS_IN_UNMOUNT, NULL);
         rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
         if (rc != EOK) {
@@ -152 +265 @@
         }
         
-        rc = async_data_write_start(vfs_phone, (void *) opts, str_size(opts));
-        if (rc != EOK) {
-                async_wait_for(req, &rc_orig);
-                async_serialize_end();
-                futex_up(&vfs_phone_futex);
-                free(mpa);
-                if (rc_orig == EOK)
-                        return (int) rc;
-                else
-                        return (int) rc_orig;
-        }
-
-        rc = async_data_write_start(vfs_phone, (void *) fs_name, str_size(fs_name));
-        if (rc != EOK) {
-                async_wait_for(req, &rc_orig);
-                async_serialize_end();
-                futex_up(&vfs_phone_futex);
-                free(mpa);
-                if (rc_orig == EOK)
-                        return (int) rc;
-                else
-                        return (int) rc_orig;
-        }
-
-        /* Ask VFS whether it likes fs_name. */
-        rc = async_req_0_0(vfs_phone, IPC_M_PING);
-        if (rc != EOK) {
-                async_wait_for(req, &rc_orig);
-                async_serialize_end();
-                futex_up(&vfs_phone_futex);
-                free(mpa);
-                if (rc_orig == EOK)
-                        return (int) rc;
-                else
-                        return (int) rc_orig;
-        }
-        
+
         async_wait_for(req, &rc);
         async_serialize_end();
@@ -358 +435 @@
 }
 
-off_t lseek(int fildes, off_t offset, int whence)
-{
-        ipcarg_t rc;
-
-        futex_down(&vfs_phone_futex);
-        async_serialize_start();
-        vfs_connect();
-        
-        ipcarg_t newoffs;
-        rc = async_req_3_1(vfs_phone, VFS_IN_SEEK, fildes, offset, whence,
-            &newoffs);
-
-        async_serialize_end();
-        futex_up(&vfs_phone_futex);
-
+off64_t lseek(int fildes, off64_t offset, int whence)
+{
+        futex_down(&vfs_phone_futex);
+        async_serialize_start();
+        vfs_connect();
+        
+        ipcarg_t newoff_lo;
+        ipcarg_t newoff_hi;
+        ipcarg_t rc = async_req_4_2(vfs_phone, VFS_IN_SEEK, fildes,
+            LOWER32(offset), UPPER32(offset), whence,
+            &newoff_lo, &newoff_hi);
+        
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        
         if (rc != EOK)
-                return (off_t) -1;
-        
-        return (off_t) newoffs;
-}
-
-int ftruncate(int fildes, off_t length)
-{
-        ipcarg_t rc;
-        
-        futex_down(&vfs_phone_futex);
-        async_serialize_start();
-        vfs_connect();
-        
-        rc = async_req_2_0(vfs_phone, VFS_IN_TRUNCATE, fildes, length);
-        async_serialize_end();
-        futex_up(&vfs_phone_futex);
+                return (off64_t) -1;
+        
+        return (off64_t) MERGE_LOUP32(newoff_lo, newoff_hi);
+}
+
+int ftruncate(int fildes, aoff64_t length)
+{
+        ipcarg_t rc;
+        
+        futex_down(&vfs_phone_futex);
+        async_serialize_start();
+        vfs_connect();
+        
+        rc = async_req_3_0(vfs_phone, VFS_IN_TRUNCATE, fildes,
+            LOWER32(length), UPPER32(length));
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        
         return (int) rc;
 }
@@ -403 +482 @@
         
         req = async_send_1(vfs_phone, VFS_IN_FSTAT, fildes, NULL);
-        rc = async_data_read_start(vfs_phone, (void *)stat, sizeof(struct stat));
+        rc = async_data_read_start(vfs_phone, (void *) stat, sizeof(struct stat));
         if (rc != EOK) {
                 ipcarg_t rc_orig;
@@ -477 +556 @@
         if (!abs) {
                 free(dirp);
-                return ENOMEM;
+                return NULL;
         }