Changeset 5126f80 in mainline for uspace/app

Timestamp:

2017-03-08T11:42:17Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0d35511

Parents:

a737667e

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-08 11:42:17)

git-committer:

Jakub Jermar <jakub@…> (2017-03-08 11:42:17)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1946

Original commit messages:

1946: Jiri Zarevucky 2013-08-06 Relativize mount, add root handle to libc and remove root from VFS server. This wraps up the "relativization" phase.

Breakage:

• Dynamic builds broken
• Mount table lookups by name

Location:

uspace/app

Files:

• bdsh/cmds/modules/mount/mount.c (modified) (1 diff)
• bdsh/cmds/modules/unmount/unmount.c (modified) (1 diff)
• init/init.c (modified) (3 diffs)
• sysinst/sysinst.c (modified) (3 diffs)
• trace/trace.c (modified) (2 diffs)

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -151 +151 @@
                 mopts = t_argv[4];
 
-        rc = vfs_mount(t_argv[1], t_argv[2], dev, mopts, 0, instance);
+        rc = mount(t_argv[1], t_argv[2], dev, mopts, 0, instance);
         if (rc != EOK) {
                 printf("Unable to mount %s filesystem to %s on %s (rc=%s)\n",

uspace/app/bdsh/cmds/modules/unmount/unmount.c

@@ -66 +66 @@
         }
 
-        rc = vfs_unmount(argv[1]);
+        rc = unmount(argv[1]);
         if (rc != EOK) {
                 printf("Unable to unmount %s (rc=%d)\n", argv[1], rc);

uspace/app/init/init.c

@@ -127 +127 @@
                 opts = "restore";
         
-        int rc = vfs_mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,
+        int rc = mount(fstype, ROOT_MOUNT_POINT, ROOT_DEVICE, opts,
             IPC_FLAG_BLOCKING, 0);
         return mount_report("Root filesystem", ROOT_MOUNT_POINT, fstype,
@@ -144 +144 @@
 static bool mount_locfs(void)
 {
-        int rc = vfs_mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "",
+        int rc = mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "",
             IPC_FLAG_BLOCKING, 0);
         return mount_report("Location service filesystem", LOCFS_MOUNT_POINT,
@@ -300 +300 @@
 static bool mount_tmpfs(void)
 {
-        int rc = vfs_mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0, 0);
+        int rc = mount(TMPFS_FS_TYPE, TMPFS_MOUNT_POINT, "", "", 0, 0);
         return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
             TMPFS_FS_TYPE, NULL, rc);

uspace/app/sysinst/sysinst.c

@@ -180 +180 @@
 
         printf("sysinst_fs_mount(): mount filesystem\n");
-        rc = vfs_mount(FS_TYPE, MOUNT_POINT, dev, "", 0, 0);
+        rc = mount(FS_TYPE, MOUNT_POINT, dev, "", 0, 0);
         if (rc != EOK)
                 return rc;
@@ -219 +219 @@
 
         printf("sysinst_copy_boot_files(): mount CD filesystem\n");
-        rc = vfs_mount(CD_FS_TYPE, CD_MOUNT_POINT, CD_DEV, "", 0, 0);
+        rc = mount(CD_FS_TYPE, CD_MOUNT_POINT, CD_DEV, "", 0, 0);
         if (rc != EOK)
                 return rc;
@@ -229 +229 @@
 
         printf("sysinst_copy_boot_files(): unmount %s\n", MOUNT_POINT);
-        rc = vfs_unmount(MOUNT_POINT);
+        rc = unmount(MOUNT_POINT);
         if (rc != EOK)
                 return rc;

uspace/app/trace/trace.c

@@ -512 +512 @@
                 goto error;
 
-        /* Send program pathname */
+        /* Send program. */
         rc = loader_set_program_path(ldr, path);
         if (rc != EOK)
@@ -523 +523 @@
 
         /* Send default files */
+        int fd_root;
         int fd_stdin;
         int fd_stdout;
         int fd_stderr;
+        
+        fd_root = vfs_root();
+        if (fd_root >= 0) {
+                rc = loader_add_inbox(ldr, "root", fd_root);
+                close(fd_root);
+                if (rc != EOK)
+                        goto error;
+        }
         
         if ((stdin != NULL) && (vfs_fhandle(stdin, &fd_stdin) == EOK)) {