Changeset 8a65373 in mainline

Timestamp:

2025-03-29T11:50:54Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

56214383

Parents:

7a80c63

Message:

hr: move registering out of specific RAIDs

Location:

uspace/srv/bd/hr

Files:

• hr.c (modified) (2 diffs)
• raid0.c (modified) (2 diffs)
• raid1.c (modified) (2 diffs)
• raid5.c (modified) (3 diffs)
• util.c (modified) (1 diff)

uspace/srv/bd/hr/hr.c

@@ -144 +144 @@
                 for (i = 0; i < cfg->dev_no; i++) {
                         if (cfg->devs[i] == 0) {
+                                /*
+                                 * XXX: own error codes, no need to log this...
+                                 * its user error not service error
+                                 */
                                 HR_ERROR("missing device provided for array "
                                     "creation, aborting");
@@ -202 +206 @@
 
         rc = new_volume->hr_ops.create(new_volume);
+        if (rc != EOK)
+                goto error;
+
+        rc = hr_register_volume(new_volume);
         if (rc != EOK)
                 goto error;

uspace/srv/bd/hr/raid0.c

@@ -82 +82 @@
 errno_t hr_raid0_create(hr_volume_t *new_volume)
 {
-        errno_t rc;
-
         assert(new_volume->level == HR_LVL_0);
 
@@ -99 +97 @@
         new_volume->hr_bds.sarg = new_volume;
 
-        rc = hr_register_volume(new_volume);
-
-        return rc;
+        return EOK;
 }
 

uspace/srv/bd/hr/raid1.c

@@ -91 +91 @@
 errno_t hr_raid1_create(hr_volume_t *new_volume)
 {
-        errno_t rc;
-
         assert(new_volume->level == HR_LVL_1);
 
@@ -114 +112 @@
                 return EINVAL;
 
-        rc = hr_register_volume(new_volume);
-
-        return rc;
+        return EOK;
 }
 

uspace/srv/bd/hr/raid5.c

@@ -93 +93 @@
 errno_t hr_raid5_create(hr_volume_t *new_volume)
 {
-        errno_t rc;
-
         assert(new_volume->level == HR_LVL_5 || new_volume->level == HR_LVL_4);
 
@@ -104 +102 @@
         fibril_rwlock_write_lock(&new_volume->states_lock);
 
-        rc = hr_raid5_update_vol_status(new_volume);
+        errno_t rc = hr_raid5_update_vol_status(new_volume);
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&new_volume->states_lock);
@@ -114 +112 @@
         new_volume->hr_bds.sarg = new_volume;
 
-        rc = hr_register_volume(new_volume);
-
         fibril_rwlock_write_unlock(&new_volume->states_lock);
 
-        return rc;
+        return EOK;
 }
 

uspace/srv/bd/hr/util.c

@@ -835 +835 @@
          * XXX: register it here
          * ... if it fails on EEXIST try different name... like + 1 on the end
+         *
+         * TODO: discuss
          */
+        rc = hr_register_volume(vol);
+        if (rc != EOK) {
+                fibril_rwlock_write_unlock(&hr_volumes_lock);
+                goto error;
+        }
 
         list_append(&vol->lvolumes, &hr_volumes);