Changeset 241f1985 in mainline for uspace/srv/vfs/vfs_register.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_register.c (modified) (2 diffs)

uspace/srv/vfs/vfs_register.c

@@ -40 +40 @@
 #include <assert.h>
 #include <async.h>
-#include <atomic.h>
+#include <stdatomic.h>
 #include <ctype.h>
 #include <errno.h>
@@ -169 +169 @@
                 fibril_mutex_unlock(&fs_list_lock);
                 free(fs_info);
-                async_answer_0(rid, rc);
-                return;
-        }
-        sysman_main_exposee_added(unit_name, request->in_task_id);
+                async_answer_0(req, rc);
+                return;
+        }
+        sysman_main_exposee_added(unit_name, req->task_id);
         free(unit_name);