Changeset 696979ce in mainline for uspace/lib/libc/generic/vfs/vfs.c

Timestamp:

2010-02-06T10:54:21Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bda2f96

Parents:

3f93cdbe (diff), 25e963a (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 from mainline.

File:

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

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

@@ -120 +120 @@
     const char *opts, unsigned int flags)
 {
-        int res;
-        ipcarg_t rc;
-        ipcarg_t rc_orig;
-        aid_t req;
+        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;
-        
-        res = devmap_device_get_handle(fqdn, &dev_handle, flags);
-        if (res != EOK)
+        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)
-                return ENOMEM;
-        
-        futex_down(&vfs_phone_futex);
-        async_serialize_start();
-        vfs_connect();
-        
-        req = async_send_2(vfs_phone, VFS_IN_MOUNT, dev_handle, flags, NULL);
-        rc = async_data_write_start(vfs_phone, (void *) mpa, 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);
@@ -146 +165 @@
                 futex_up(&vfs_phone_futex);
                 free(mpa);
+                
+                if (null_id != -1)
+                        devmap_null_destroy(null_id);
+                
                 if (rc_orig == EOK)
                         return (int) rc;
@@ -158 +181 @@
                 futex_up(&vfs_phone_futex);
                 free(mpa);
-                if (rc_orig == EOK)
-                        return (int) rc;
-                else
-                        return (int) rc_orig;
-        }
-
+                
+                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) {
@@ -170 +197 @@
                 futex_up(&vfs_phone_futex);
                 free(mpa);
-                if (rc_orig == EOK)
-                        return (int) rc;
-                else
-                        return (int) rc_orig;
-        }
-
+                
+                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);
@@ -183 +214 @@
                 futex_up(&vfs_phone_futex);
                 free(mpa);
+                
+                if (null_id != -1)
+                        devmap_null_destroy(null_id);
+                
                 if (rc_orig == EOK)
                         return (int) rc;
@@ -193 +228 @@
         futex_up(&vfs_phone_futex);
         free(mpa);
+        
+        if ((rc != EOK) && (null_id != -1))
+                devmap_null_destroy(null_id);
         
         return (int) rc;