Changeset da5c257 in mainline for uspace/srv/bd/hr/raid1.c

Timestamp:

2024-08-31T10:35:43Z (11 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

12cbf25e

Parents:

e0b7763

Message:

hr: create util.c

File:

• uspace/srv/bd/hr/raid1.c (modified) (3 diffs)

uspace/srv/bd/hr/raid1.c

@@ -49 +49 @@
 
 #include "var.h"
+#include "util.h"
 
 extern fibril_mutex_t big_lock;
@@ -160 +161 @@
 
         errno_t rc;
-        service_id_t new_id;
-        category_id_t cat_id;
 
         rc = hr_init_devs(new_volume);
         if (rc != EOK)
-                goto end;
+                return rc;
 
         bd_srvs_init(&new_volume->hr_bds);
@@ -171 +170 @@
         new_volume->hr_bds.sarg = new_volume;
 
-        rc = loc_service_register(hr_srv, new_volume->devname, &new_id);
+        rc = hr_register_volume(new_volume);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "unable to register device \"%s\": %s\n",
-                    new_volume->devname, str_error(rc));
-
-                goto error;
+                hr_fini_devs(new_volume);
+                return rc;
         }
 
-        rc = loc_category_get_id("raid", &cat_id, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "failed resolving category \"raid\": %s\n", str_error(rc));
-                goto error;
-        }
-
-        rc = loc_service_add_to_cat(hr_srv, new_id, cat_id);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR,
-                    "failed adding \"%s\" to category \"raid\": %s\n",
-                    new_volume->devname, str_error(rc));
-                goto error;
-        }
-
-        new_volume->svc_id = new_id;
-
         return EOK;
-error:
-        hr_fini_devs(new_volume);
-end:
-        return rc;
 }