Changeset 56602e0 in mainline for uspace/srv/bd/hr/raid5.c

Timestamp:

2025-05-07T11:27:25Z (5 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

964e897

Parents:

155d34f

git-author:

Miroslav Cimerman <mc@…> (2025-05-07 11:26:23)

git-committer:

Miroslav Cimerman <mc@…> (2025-05-07 11:27:25)

Message:

hr: rename all strings status' -> state'

File:

• uspace/srv/bd/hr/raid5.c (modified) (19 diffs)

uspace/srv/bd/hr/raid5.c

@@ -56 +56 @@
 static errno_t  hr_raid5_vol_usable(hr_volume_t *);
 static ssize_t  hr_raid5_get_bad_ext(hr_volume_t *);
-static errno_t  hr_raid5_update_vol_status(hr_volume_t *);
+static errno_t  hr_raid5_update_vol_state(hr_volume_t *);
 static void     hr_raid5_handle_extent_error(hr_volume_t *, size_t, errno_t);
 static void     xor(void *, const void *, size_t);
@@ -105 +105 @@
         fibril_rwlock_write_lock(&new_volume->states_lock);
 
-        errno_t rc = hr_raid5_update_vol_status(new_volume);
+        errno_t rc = hr_raid5_update_vol_state(new_volume);
         if (rc != EOK) {
                 HR_NOTE("\"%s\": unusable state, not creating\n",
@@ -145 +145 @@
 }
 
-void hr_raid5_status_event(hr_volume_t *vol)
+void hr_raid5_state_event(hr_volume_t *vol)
 {
         fibril_mutex_lock(&vol->lock);
         fibril_rwlock_write_lock(&vol->states_lock);
-        (void)hr_raid5_update_vol_status(vol);
+        (void)hr_raid5_update_vol_state(vol);
         fibril_rwlock_write_unlock(&vol->states_lock);
         fibril_mutex_unlock(&vol->lock);
@@ -167 +167 @@
          * If the volume is degraded, start rebuild right away.
          */
-        if (vol->status == HR_VOL_DEGRADED) {
+        if (vol->state == HR_VOL_DEGRADED) {
                 HR_DEBUG("hr_raid5_add_hotspare(): volume in DEGRADED state, "
                     "spawning new rebuild fibril\n");
@@ -243 +243 @@
 static errno_t hr_raid5_vol_usable(hr_volume_t *vol)
 {
-        if (vol->status == HR_VOL_ONLINE ||
-            vol->status == HR_VOL_DEGRADED ||
-            vol->status == HR_VOL_REBUILD)
+        if (vol->state == HR_VOL_ONLINE ||
+            vol->state == HR_VOL_DEGRADED ||
+            vol->state == HR_VOL_REBUILD)
                 return EOK;
         return EIO;
@@ -257 +257 @@
 {
         for (size_t i = 0; i < vol->extent_no; i++)
-                if (vol->extents[i].status != HR_EXT_ONLINE)
+                if (vol->extents[i].state != HR_EXT_ONLINE)
                         return i;
         return -1;
 }
 
-static errno_t hr_raid5_update_vol_status(hr_volume_t *vol)
-{
-        hr_vol_status_t old_state = vol->status;
+static errno_t hr_raid5_update_vol_state(hr_volume_t *vol)
+{
+        hr_vol_state_t old_state = vol->state;
         size_t bad = 0;
         for (size_t i = 0; i < vol->extent_no; i++)
-                if (vol->extents[i].status != HR_EXT_ONLINE)
+                if (vol->extents[i].state != HR_EXT_ONLINE)
                         bad++;
 
@@ -273 +273 @@
         case 0:
                 if (old_state != HR_VOL_ONLINE)
-                        hr_update_vol_status(vol, HR_VOL_ONLINE);
+                        hr_update_vol_state(vol, HR_VOL_ONLINE);
                 return EOK;
         case 1:
@@ -279 +279 @@
                     old_state != HR_VOL_REBUILD) {
 
-                        hr_update_vol_status(vol, HR_VOL_DEGRADED);
+                        hr_update_vol_state(vol, HR_VOL_DEGRADED);
 
                         if (vol->hotspare_no > 0) {
@@ -293 +293 @@
         default:
                 if (old_state != HR_VOL_FAULTY)
-                        hr_update_vol_status(vol, HR_VOL_FAULTY);
+                        hr_update_vol_state(vol, HR_VOL_FAULTY);
                 return EIO;
         }
@@ -302 +302 @@
 {
         if (rc == ENOENT)
-                hr_update_ext_status(vol, extent, HR_EXT_MISSING);
+                hr_update_ext_state(vol, extent, HR_EXT_MISSING);
         else if (rc != EOK)
-                hr_update_ext_status(vol, extent, HR_EXT_FAILED);
+                hr_update_ext_state(vol, extent, HR_EXT_FAILED);
 }
 
@@ -537 +537 @@
         if (type == HR_BD_SYNC && ba == 0 && cnt == 0) {
                 hr_sync_all_extents(vol);
-                rc = hr_raid5_update_vol_status(vol);
+                rc = hr_raid5_update_vol_state(vol);
                 return rc;
         }
@@ -611 +611 @@
                 switch (type) {
                 case HR_BD_SYNC:
-                        if (vol->extents[extent].status != HR_EXT_ONLINE)
+                        if (vol->extents[extent].state != HR_EXT_ONLINE)
                                 break;
                         rc = block_sync_cache(vol->extents[extent].svc_id,
@@ -648 +648 @@
 
                 if (rc != EOK) {
-                        rc = hr_raid5_update_vol_status(vol);
+                        rc = hr_raid5_update_vol_state(vol);
                         if (rc == EOK) {
                                 /*
@@ -700 +700 @@
 
 error:
-        (void)hr_raid5_update_vol_status(vol);
+        (void)hr_raid5_update_vol_state(vol);
         fibril_rwlock_write_unlock(&vol->states_lock);
         fibril_mutex_unlock(&vol->lock);
@@ -727 +727 @@
         size_t bad = vol->extent_no;
         for (size_t i = 0; i < vol->extent_no; i++) {
-                if (vol->extents[i].status == HR_EXT_FAILED) {
+                if (vol->extents[i].state == HR_EXT_FAILED) {
                         bad = i;
                         break;
@@ -742 +742 @@
         size_t hotspare_idx = vol->hotspare_no - 1;
 
-        hr_ext_status_t hs_state = vol->hotspares[hotspare_idx].status;
+        hr_ext_state_t hs_state = vol->hotspares[hotspare_idx].state;
         if (hs_state != HR_EXT_HOTSPARE) {
                 HR_ERROR("hr_raid5_rebuild(): invalid hotspare state \"%s\", "
@@ -755 +755 @@
 
         vol->extents[bad].svc_id = vol->hotspares[hotspare_idx].svc_id;
-        hr_update_ext_status(vol, bad, HR_EXT_HOTSPARE);
+        hr_update_ext_state(vol, bad, HR_EXT_HOTSPARE);
 
         vol->hotspares[hotspare_idx].svc_id = 0;
         fibril_mutex_lock(&vol->hotspare_lock);
-        hr_update_hotspare_status(vol, hotspare_idx, HR_EXT_MISSING);
+        hr_update_hotspare_state(vol, hotspare_idx, HR_EXT_MISSING);
         fibril_mutex_unlock(&vol->hotspare_lock);
 
@@ -769 +769 @@
             rebuild_ext->svc_id);
 
-        hr_update_ext_status(vol, bad, HR_EXT_REBUILD);
-        hr_update_vol_status(vol, HR_VOL_REBUILD);
+        hr_update_ext_state(vol, bad, HR_EXT_REBUILD);
+        hr_update_vol_state(vol, HR_VOL_REBUILD);
 
         uint64_t max_blks = DATA_XFER_LIMIT / vol->bsize;
@@ -838 +838 @@
             "extent number %zu\n", vol->devname, vol->svc_id, hotspare_idx);
 
-        hr_update_ext_status(vol, bad, HR_EXT_ONLINE);
+        hr_update_ext_state(vol, bad, HR_EXT_ONLINE);
 
         rc = vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
 
 end:
-        (void)hr_raid5_update_vol_status(vol);
+        (void)hr_raid5_update_vol_state(vol);
 
         fibril_rwlock_write_unlock(&vol->states_lock);