Changeset 210e50a in mainline

Timestamp:

2010-02-03T13:36:46Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

28be7fa

Parents:

82474ef

Message:

understand an empty fqdn as the device argument to mount() as an implicit request to create a fresh null/%d device

Location:

uspace

Files:

• app/init/init.c (modified) (2 diffs)
• app/tester/vfs/vfs1.c (modified) (1 diff)
• lib/libc/generic/vfs/vfs.c (modified) (6 diffs)

uspace/app/init/init.c

@@ -94 +94 @@
 static bool mount_devfs(void)
 {
-        char null[MAX_DEVICE_NAME];
-        int null_id = devmap_null_create();
-        
-        if (null_id == -1) {
-                printf(NAME ": Unable to create null device\n");
-                return false;
-        }
-        
-        snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
-        int rc = mount("devfs", DEVFS_MOUNT_POINT, null, "", IPC_FLAG_BLOCKING);
+        int rc = mount("devfs", DEVFS_MOUNT_POINT, "", "", IPC_FLAG_BLOCKING);
         
         switch (rc) {
@@ -111 +102 @@
         case EBUSY:
                 printf(NAME ": Device filesystem already mounted\n");
-                devmap_null_destroy(null_id);
                 return false;
         case ELIMIT:
                 printf(NAME ": Unable to mount device filesystem\n");
-                devmap_null_destroy(null_id);
                 return false;
         case ENOENT:
                 printf(NAME ": Unknown filesystem type (devfs)\n");
-                devmap_null_destroy(null_id);
                 return false;
         default:
                 printf(NAME ": Error mounting device filesystem (%d)\n", rc);
-                devmap_null_destroy(null_id);
                 return false;
         }

uspace/app/tester/vfs/vfs1.c

@@ -79 +79 @@
         TPRINTF("Created directory %s\n", MOUNT_POINT);
         
-        char null[MAX_DEVICE_NAME];
-        int null_id = devmap_null_create();
-        
-        if (null_id == -1)
-                return "Unable to create null device";
-        
-        snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
-        int rc = mount(FS_TYPE, MOUNT_POINT, null, OPTIONS, FLAGS);
+        int rc = mount(FS_TYPE, MOUNT_POINT, "", OPTIONS, FLAGS);
         switch (rc) {
         case EOK:
-                TPRINTF("Mounted /dev/%s as %s on %s\n", null, FS_TYPE, MOUNT_POINT);
+                TPRINTF("Mounted %s on %s\n", FS_TYPE, MOUNT_POINT);
                 break;
         case EBUSY:

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

@@ -125 +125 @@
         aid_t req;
         dev_handle_t dev_handle;
+        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;
+        }
         
         res = devmap_device_get_handle(fqdn, &dev_handle, flags);
-        if (res != EOK)
+        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;
+        if (!mpa) {
+                if (null_id != -1)
+                        devmap_null_destroy(null_id);
+                
+                return ENOMEM;
+        }
         
         futex_down(&vfs_phone_futex);
@@ -146 +168 @@
                 futex_up(&vfs_phone_futex);
                 free(mpa);
+                
+                if (null_id != -1)
+                        devmap_null_destroy(null_id);
+                
                 if (rc_orig == EOK)
                         return (int) rc;
@@ -158 +184 @@
                 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 +200 @@
                 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 +217 @@
                 futex_up(&vfs_phone_futex);
                 free(mpa);
+                
+                if (null_id != -1)
+                        devmap_null_destroy(null_id);
+                
                 if (rc_orig == EOK)
                         return (int) rc;
@@ -193 +231 @@
         futex_up(&vfs_phone_futex);
         free(mpa);
+        
+        if ((rc != EOK) && (null_id != -1))
+                devmap_null_destroy(null_id);
         
         return (int) rc;