Changeset 241f1985 in mainline for uspace/srv/sysman/units/unit_mnt.c

Timestamp:

2019-08-31T10:45:17Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

File:

• uspace/srv/sysman/units/unit_mnt.c (modified) (6 diffs)

uspace/srv/sysman/units/unit_mnt.c

@@ -130 +130 @@
 }
 
-static int unit_mnt_load(unit_t *unit, ini_configuration_t *ini_conf,
+static errno_t unit_mnt_load(unit_t *unit, ini_configuration_t *ini_conf,
     text_parse_t *text_parse)
 {
@@ -148 +148 @@
 }
 
-static int mount_exec(void *arg)
+static errno_t mount_exec(void *arg)
 {
         mount_data_t *mnt_data = arg;
@@ -156 +156 @@
             mnt_data->flags, mnt_data->instance);
 
-        int rc = mount(mnt_data->type, mnt_data->mountpoint, mnt_data->device,
+        errno_t rc = vfs_mount_path(mnt_data->type, mnt_data->mountpoint, mnt_data->device,
             mnt_data->options ? mnt_data->options : "",
             mnt_data->flags, mnt_data->instance);
@@ -188 +188 @@
 }
 
-static int unit_mnt_start(unit_t *unit)
+static errno_t unit_mnt_start(unit_t *unit)
 {
         unit_mnt_t *u_mnt = CAST_MNT(unit);
@@ -228 +228 @@
 }
 
-static int unit_mnt_stop(unit_t *unit)
+static errno_t unit_mnt_stop(unit_t *unit)
 {
         unit_mnt_t *u_mnt = CAST_MNT(unit);
@@ -245 +245 @@
          * unmount synchronously in the event loop fibril.
          */
-        int rc = unmount(u_mnt->mountpoint);
+        errno_t rc = vfs_unmount_path(u_mnt->mountpoint);
 
         if (rc == EOK) {