Changeset da5c257 in mainline

Timestamp:

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

Author:

Miroslav Cimerman <mc@…>

Children:

12cbf25e

Parents:

e0b7763

Message:

hr: create util.c

Location:

uspace/srv/bd/hr

Files:

• hr.c (modified) (3 diffs)
• meson.build (modified) (1 diff)
• raid1.c (modified) (3 diffs)
• util.c (added)
• util.h (added)
• var.h (modified) (2 diffs)

uspace/srv/bd/hr/hr.c

@@ -36 +36 @@
 #include <async.h>
 #include <bd_srv.h>
-#include <block.h>
 #include <errno.h>
 #include <hr.h>
@@ -59 +58 @@
 static service_id_t ctl_sid;
 
-errno_t hr_init_devs(hr_volume_t *vol)
-{
-        log_msg(LOG_DEFAULT, LVL_NOTE, "hr_init_devs()");
-
-        errno_t rc;
-        size_t i;
-
-        for (i = 0; i < vol->dev_no; i++) {
-                rc = block_init(vol->devs[i]);
-                log_msg(LOG_DEFAULT, LVL_DEBUG,
-                    "hr_init_devs(): initing (%" PRIun ")", vol->devs[i]);
-                if (rc != EOK) {
-                        log_msg(LOG_DEFAULT, LVL_ERROR,
-                            "hr_init_devs(): initing (%" PRIun ") failed, aborting",
-                            vol->devs[i]);
-                        break;
-                }
-        }
-
-        return rc;
-}
-
-void hr_fini_devs(hr_volume_t *vol)
-{
-        log_msg(LOG_DEFAULT, LVL_NOTE, "hr_fini_devs()");
-
-        size_t i;
-
-        for (i = 0; i < vol->dev_no; i++)
-                block_fini(vol->devs[i]);
-}
-
 static void hr_create_srv(ipc_call_t *icall)
 {
@@ -211 +178 @@
         hr_volume_t *vol;
 
-        sysarg_t svc_id = ipc_get_arg2(icall);
+        service_id_t svc_id = ipc_get_arg2(icall);
 
         if (svc_id == ctl_sid) {

uspace/srv/bd/hr/meson.build

@@ -28 +28 @@
 
 deps = [ 'block', 'device' ]
-src = files('hr.c', 'raid1.c')
+src = files('hr.c', 'raid1.c', 'util.c')

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;
 }
 

uspace/srv/bd/hr/var.h

@@ -37 +37 @@
 #define _HR_VAR_H
 
+#include <bd_srv.h>
+#include <errno.h>
+#include <hr.h>
+
 #define NAME "hr"
 
@@ -59 +63 @@
 extern void hr_fini_devs(hr_volume_t *);
 
+extern errno_t hr_raid0_create(hr_volume_t *);
 extern errno_t hr_raid1_create(hr_volume_t *);