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

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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 mainline changes.

File:

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

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

@@ -72 +72 @@
         int rc;
 
-        get_mtab_list(&mtab_list);
+        vfs_get_mtab_list(&mtab_list);
 
         list_foreach(mtab_list, link, mtab_ent_t, mtab_ent) {
@@ -150 +150 @@
                 mopts = t_argv[4];
 
-        rc = mount(t_argv[1], t_argv[2], dev, mopts, 0, instance);
+        rc = vfs_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=%d)\n",