Changeset 89204a23 in mainline

Timestamp:

2015-11-02T19:15:12Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3feeab2

Parents:

9624c35

Message:

Partition service registration could be quicker than the call to loc_server_register(), causing locsrv communicatons break down.

File:

• uspace/srv/bd/vbd/vbd.c (modified) (1 diff)

uspace/srv/bd/vbd/vbd.c

@@ -64 +64 @@
                 return rc;
 
+        async_set_client_connection(vbds_client_conn);
+
+        rc = loc_server_register(NAME);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc);
+                return EEXIST;
+        }
+
+        rc = loc_service_register(SERVICE_NAME_VBD, &ctl_sid);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
+                return EEXIST;
+        }
+
         rc = vbds_disk_discovery_start();
         if (rc != EOK)
                 return rc;
-
-        async_set_client_connection(vbds_client_conn);
-
-        rc = loc_server_register(NAME);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server (%d).", rc);
-                return EEXIST;
-        }
-
-        rc = loc_service_register(SERVICE_NAME_VBD, &ctl_sid);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service (%d).", rc);
-                return EEXIST;
-        }
 
         return EOK;