Changeset 241f1985 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2019-08-31T10:45:17Z (6 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/vfs/vfs_ops.c (modified) (3 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -50 +50 @@
 #include <assert.h>
 #include <vfs/canonify.h>
+#include <sysman/ctl.h>
 
 /* Forward declarations of static functions. */
 static errno_t vfs_truncate_internal(fs_handle_t, service_id_t, fs_index_t,
     aoff64_t);
+
+static errno_t vfs_fs_request_start(const char *fs_name, unsigned int instance);
 
 /**
@@ -144 +147 @@
                                  */
                                 fibril_mutex_unlock(&fs_list_lock);
-                                rc = vfs_fs_request_start(fs_name, instance);
+                                errno_t rc = vfs_fs_request_start(fsname, instance);
                                 fibril_mutex_lock(&fs_list_lock);
 
                                 if (rc != EOK) {
-                                        fibril_mutex_unlock(&fs_list_lock);
-                                        async_answer_0(callid, rc);
-                                        async_answer_0(rid, rc);
-                                        free(mp);
-                                        free(fs_name);
-                                        free(opts);
-                                        return;
+                                        return rc;
                                 }
+
                                 /*
                                  * Succesful start request, new server should be
@@ -216 +214 @@
 }
 
-static int vfs_fs_request_start(const char *fs_name, unsigned int instance)
+static errno_t vfs_fs_request_start(const char *fs_name, unsigned int instance)
 {
         char *unit_name = NULL;