Changeset 56214383 in mainline

Timestamp:

2025-03-29T12:09:58Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

49de61c

Parents:

8a65373

Message:

hr: util: hr_util_add_hotspare()

Location:

uspace/srv/bd/hr

Files:

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

uspace/srv/bd/hr/raid1.c

@@ -145 +145 @@
         HR_DEBUG("%s()", __func__);
 
-        errno_t rc = EOK;
-
-        fibril_mutex_lock(&vol->hotspare_lock);
-
-        if (vol->hotspare_no >= HR_MAX_HOTSPARES) {
-                HR_ERROR("hr_raid1_add_hotspare(): cannot add more hotspares "
-                    "to \"%s\"\n", vol->devname);
-                rc = ELIMIT;
-                goto error;
-        }
-
-        size_t hs_idx = vol->hotspare_no;
-
-        vol->hotspare_no++;
-
-        hr_update_hotspare_svc_id(vol, hs_idx, hotspare);
-        hr_update_hotspare_status(vol, hs_idx, HR_EXT_HOTSPARE);
-
-        hr_mark_vol_state_dirty(vol);
-error:
-        fibril_mutex_unlock(&vol->hotspare_lock);
+        errno_t rc = hr_util_add_hotspare(vol, hotspare);
 
         hr_raid1_update_vol_status(vol);
@@ -656 +636 @@
         service_id_t hs_svc_id = vol->hotspares[hs].svc_id;
 
-        /* TODO: if rc != EOK, try next hotspare */
-        errno_t rc = block_init(hs_svc_id);
-        if (rc != EOK) {
-                HR_ERROR("hr_raid1_rebuild(): initing hotspare (%lu) failed\n",
-                    hs_svc_id);
-                return rc;
-        }
-
         hr_update_ext_svc_id(vol, bad, hs_svc_id);
         hr_update_ext_status(vol, bad, HR_EXT_HOTSPARE);

uspace/srv/bd/hr/raid5.c

@@ -150 +150 @@
 errno_t hr_raid5_add_hotspare(hr_volume_t *vol, service_id_t hotspare)
 {
-        HR_DEBUG("hr_raid5_add_hotspare()\n");
+        HR_DEBUG("%s()", __func__);
 
         fibril_mutex_lock(&vol->lock);
-        fibril_mutex_lock(&vol->hotspare_lock);
-
-        if (vol->hotspare_no >= HR_MAX_HOTSPARES) {
-                HR_ERROR("hr_raid5_add_hotspare(): cannot add more hotspares "
-                    "to \"%s\"\n", vol->devname);
-                fibril_mutex_unlock(&vol->lock);
-                return ELIMIT;
-        }
-
-        vol->hotspares[vol->hotspare_no].svc_id = hotspare;
-
-        vol->hotspare_no++;
-
-        hr_update_hotspare_status(vol, vol->hotspare_no - 1, HR_EXT_HOTSPARE);
+
+        errno_t rc = hr_util_add_hotspare(vol, hotspare);
+        if (rc != EOK)
+                goto end;
 
         /*
@@ -184 +174 @@
         }
 
-        fibril_mutex_unlock(&vol->hotspare_lock);
+end:
         fibril_mutex_unlock(&vol->lock);
 
-        return EOK;
+        return rc;
 }
 
@@ -770 +760 @@
         hr_extent_t *rebuild_ext = &vol->extents[bad];
 
-        rc = block_init(rebuild_ext->svc_id);
-        if (rc != EOK) {
-                HR_ERROR("hr_raid5_rebuild(): initing (%lu) failed, "
-                    "aborting rebuild\n", rebuild_ext->svc_id);
-                goto end;
-        }
-
         HR_DEBUG("hr_raid5_rebuild(): starting rebuild on (%lu)\n",
             rebuild_ext->svc_id);

uspace/srv/bd/hr/util.c

@@ -983 +983 @@
 }
 
+errno_t hr_util_add_hotspare(hr_volume_t *vol, service_id_t hotspare)
+{
+        HR_DEBUG("%s()", __func__);
+
+        errno_t rc = EOK;
+
+        fibril_mutex_lock(&vol->hotspare_lock);
+
+        if (vol->hotspare_no >= HR_MAX_HOTSPARES) {
+                HR_ERROR("%s(): cannot add more hotspares "
+                    "to \"%s\"\n", __func__, vol->devname);
+                rc = ELIMIT;
+                goto end;
+        }
+
+        rc = block_init(hotspare);
+        if (rc != EOK)
+                goto end;
+
+        size_t hs_idx = vol->hotspare_no;
+
+        vol->hotspare_no++;
+
+        hr_update_hotspare_svc_id(vol, hs_idx, hotspare);
+        hr_update_hotspare_status(vol, hs_idx, HR_EXT_HOTSPARE);
+
+        hr_mark_vol_state_dirty(vol);
+end:
+        fibril_mutex_unlock(&vol->hotspare_lock);
+        return rc;
+}
+
 /** @}
  */

uspace/srv/bd/hr/util.h

@@ -78 +78 @@
     uint64_t);
 extern errno_t           hr_util_try_auto_assemble(size_t *);
+extern errno_t           hr_util_add_hotspare(hr_volume_t *, service_id_t);
 
 #endif