Changes in uspace/srv/bd/vbd/disk.c [ddfe233:fafb8e5] in mainline

File:

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

uspace/srv/bd/vbd/disk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2016 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 */
@@ -499 +497 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "block_init(%zu)", sid);
-        rc = block_init(sid);
+        rc = block_init(sid, 2048);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed opening block device %s.",
@@ -581 +579 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "block_fini(%zu)", sid);
         block_fini(sid);
-        free(disk->svc_name);
         free(disk);
         return EOK;
@@ -1125 +1122 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loc_service_register('%s')",
             name);
-        rc = loc_service_register(vbds_srv, name, &psid);
+        rc = loc_service_register(name, &psid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering "
@@ -1134 +1131 @@
         }
 
-        rc = loc_service_add_to_cat(vbds_srv, psid, part_cid);
+        rc = loc_service_add_to_cat(psid, part_cid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failled adding partition "
@@ -1141 +1138 @@
                 free(part);
 
-                rc = loc_service_unregister(vbds_srv, psid);
+                rc = loc_service_unregister(psid);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Error unregistering "
@@ -1163 +1160 @@
             "disk->svc_name='%s', id=%zu)", part->disk->svc_name, part->svc_id);
 
-        rc = loc_service_unregister(vbds_srv, part->svc_id);
+        rc = loc_service_unregister(part->svc_id);
         if (rc != EOK)
                 return EIO;