Changeset 368ee04 in mainline for uspace/app/bdsh/cmds/modules/mount/mount.c

Timestamp:

2017-04-05T18:10:39Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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 lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/app/bdsh/cmds/modules/mount/mount.c (modified) (4 diffs)

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

@@ -32 +32 @@
 #include <str_error.h>
 #include <vfs/vfs.h>
+#include <vfs/vfs_mtab.h>
 #include <adt/list.h>
 #include <errno.h>
@@ -82 +83 @@
 
                 printf("%s", mtab_ent->fs_name);
-                if (mtab_ent->instance)
-                        printf("/%d", mtab_ent->instance);
 
                 printf(" %s", mtab_ent->mp);
@@ -94 +93 @@
                         printf(" (%" PRIun ")", mtab_ent->service_id);
                 }
-
-                if (str_size(mtab_ent->opts) > 0)
-                        printf(" (%s)", mtab_ent->opts);
 
                 putchar('\n');
@@ -151 +147 @@
                 mopts = t_argv[4];
 
-        rc = vfs_mount(t_argv[1], t_argv[2], dev, mopts, 0, instance);
+        rc = vfs_mount_path(t_argv[2], t_argv[1], dev, mopts, 0, instance);
         if (rc != EOK) {
                 printf("Unable to mount %s filesystem to %s on %s (rc=%s)\n",
-                    t_argv[1], t_argv[2], t_argv[3], str_error(rc));
+                    t_argv[2], t_argv[1], t_argv[3], str_error(rc));
                 return CMD_FAILURE;
         }