Changeset 996d31ac in mainline

Timestamp:

2025-07-02T20:43:58Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

038a8d0

Parents:

dcdb990

Message:

hr: retire level specific add_hotspare() hr_ops_t

Location:

uspace/srv/bd/hr

Files:

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

uspace/srv/bd/hr/hr.c

@@ -407 +407 @@
         }
 
-        if (vol->hr_ops.add_hotspare == NULL) {
-                HR_NOTE("hotspare not supported on RAID level = %d, "
-                    "metadata type = %s\n", vol->level,
+        if (vol->level == HR_LVL_0) {
+                HR_NOTE("hotspare not supported on RAID level = %s\n",
+                    hr_get_level_str(vol->level));
+                async_answer_0(icall, ENOTSUP);
+                return;
+        }
+
+        if (!(vol->meta_ops->get_flags() & HR_METADATA_HOTSPARE_SUPPORT)) {
+                HR_NOTE("hotspare not supported on metadata type = %s\n",
                     hr_get_metadata_type_str(vol->meta_ops->get_type()));
                 async_answer_0(icall, ENOTSUP);
@@ -415 +421 @@
         }
 
-        rc = vol->hr_ops.add_hotspare(vol, hotspare);
+        rc = hr_util_add_hotspare(vol, hotspare);
+
+        vol->hr_ops.vol_state_eval(vol);
 
         async_answer_0(icall, rc);

uspace/srv/bd/hr/raid1.c

@@ -133 +133 @@
 }
 
-errno_t hr_raid1_add_hotspare(hr_volume_t *vol, service_id_t hotspare)
-{
-        HR_DEBUG("%s()", __func__);
-
-        errno_t rc = hr_util_add_hotspare(vol, hotspare);
-
-        hr_raid1_vol_state_eval(vol);
-
-        return rc;
-}
-
 void hr_raid1_vol_state_eval(hr_volume_t *vol)
 {

uspace/srv/bd/hr/raid5.c

@@ -155 +155 @@
 }
 
-errno_t hr_raid5_add_hotspare(hr_volume_t *vol, service_id_t hotspare)
-{
-        HR_DEBUG("%s()", __func__);
-
-        errno_t rc = hr_util_add_hotspare(vol, hotspare);
-
-        hr_raid5_vol_state_eval(vol);
-
-        return rc;
-}
-
 void hr_raid5_ext_state_cb(hr_volume_t *vol, size_t extent, errno_t rc)
 {

uspace/srv/bd/hr/util.c

@@ -119 +119 @@
         vol->meta_ops = hr_get_meta_type_ops(metadata_type);
 
-        uint8_t meta_flags = vol->meta_ops->get_flags();
-
         switch (level) {
         case HR_LVL_0:
@@ -133 +131 @@
                 vol->hr_ops.vol_state_eval = hr_raid1_vol_state_eval;
                 vol->hr_ops.ext_state_cb = hr_raid1_ext_state_cb;
-                if (meta_flags & HR_METADATA_HOTSPARE_SUPPORT)
-                        vol->hr_ops.add_hotspare = hr_raid1_add_hotspare;
                 break;
         case HR_LVL_4:
@@ -142 +138 @@
                 vol->hr_ops.vol_state_eval = hr_raid5_vol_state_eval;
                 vol->hr_ops.ext_state_cb = hr_raid5_ext_state_cb;
-                if (meta_flags & HR_METADATA_HOTSPARE_SUPPORT)
-                        vol->hr_ops.add_hotspare = hr_raid5_add_hotspare;
                 break;
         default:

uspace/srv/bd/hr/var.h

@@ -66 +66 @@
         errno_t (*create)(hr_volume_t *);
         errno_t (*init)(hr_volume_t *);
-        errno_t (*add_hotspare)(hr_volume_t *, service_id_t);
         void (*vol_state_eval)(hr_volume_t *);
         void (*ext_state_cb)(hr_volume_t *, size_t, errno_t);
@@ -138 +137 @@
 extern errno_t hr_raid5_init(hr_volume_t *);
 
-extern errno_t hr_raid1_add_hotspare(hr_volume_t *, service_id_t);
-extern errno_t hr_raid5_add_hotspare(hr_volume_t *, service_id_t);
-
 extern void hr_raid0_vol_state_eval(hr_volume_t *);
 extern void hr_raid1_vol_state_eval(hr_volume_t *);