Changeset 1c6c3e1d in mainline for uspace/srv/bd/vbd/disk.c

Timestamp:

2023-10-22T17:55:33Z (15 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (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 branch 'master' into ticket

File:

• uspace/srv/bd/vbd/disk.c (modified) (6 diffs)

uspace/srv/bd/vbd/disk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2016 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -51 +51 @@
 #include "types/vbd.h"
 
+loc_srv_t *vbds_srv;
+
 static fibril_mutex_t vbds_disks_lock;
 static list_t vbds_disks; /* of vbds_disk_t */
@@ -1122 +1124 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loc_service_register('%s')",
             name);
-        rc = loc_service_register(name, &psid);
+        rc = loc_service_register(vbds_srv, name, &psid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering "
@@ -1131 +1133 @@
         }
 
-        rc = loc_service_add_to_cat(psid, part_cid);
+        rc = loc_service_add_to_cat(vbds_srv, psid, part_cid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failled adding partition "
@@ -1138 +1140 @@
                 free(part);
 
-                rc = loc_service_unregister(psid);
+                rc = loc_service_unregister(vbds_srv, psid);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Error unregistering "
@@ -1160 +1162 @@
             "disk->svc_name='%s', id=%zu)", part->disk->svc_name, part->svc_id);
 
-        rc = loc_service_unregister(part->svc_id);
+        rc = loc_service_unregister(vbds_srv, part->svc_id);
         if (rc != EOK)
                 return EIO;