Changeset 23df41b in mainline

Timestamp:

2025-01-13T22:18:22Z (5 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

a6fb937

Parents:

35f2a877

Message:

hr: move hr_process_deferred_invalidations() to util

Location:

uspace/srv/bd/hr

Files:

• raid1.c (modified) (4 diffs)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

uspace/srv/bd/hr/raid1.c

@@ -67 +67 @@
 static errno_t hr_raid1_restore_blocks(hr_volume_t *, size_t, uint64_t, size_t,
     void *);
-static void hr_process_deferred_invalidations(hr_volume_t *);
 
 /* bdops */
@@ -108 +107 @@
         atomic_store(&new_volume->state_changed, true);
         hr_raid1_update_vol_status(new_volume);
-        if (new_volume->status == HR_VOL_FAULTY)
+
+        fibril_rwlock_read_lock(&new_volume->states_lock);
+        hr_vol_status_t state = new_volume->status;
+        fibril_rwlock_read_unlock(&new_volume->states_lock);
+        if (state == HR_VOL_FAULTY || state == HR_VOL_INVALID)
                 return EINVAL;
 
@@ -359 +362 @@
         fibril_rwlock_read_unlock(&vol->states_lock);
 
-        if (vol_state == HR_VOL_FAULTY)
+        if (vol_state == HR_VOL_FAULTY || vol_state == HR_VOL_INVALID)
                 return EIO;
 
@@ -779 +782 @@
 }
 
-static void hr_process_deferred_invalidations(hr_volume_t *vol)
-{
-        HR_DEBUG("hr_raid1_update_vol_status(): deferred invalidations\n");
-
-        fibril_mutex_lock(&vol->halt_lock);
-        vol->halt_please = true;
-        fibril_rwlock_write_lock(&vol->extents_lock);
-        fibril_rwlock_write_lock(&vol->states_lock);
-        fibril_mutex_lock(&vol->hotspare_lock);
-
-        list_foreach(vol->deferred_invalidations_list, link,
-            hr_deferred_invalidation_t, di) {
-                assert(vol->extents[di->index].status == HR_EXT_INVALID);
-
-                HR_DEBUG("moving invalidated extent no. %lu to hotspares\n",
-                    di->index);
-
-                block_fini(di->svc_id);
-
-                size_t hs_idx = vol->hotspare_no;
-
-                vol->hotspare_no++;
-
-                hr_update_hotspare_svc_id(vol, hs_idx, di->svc_id);
-                hr_update_hotspare_status(vol, hs_idx, HR_EXT_HOTSPARE);
-
-                hr_update_ext_svc_id(vol, di->index, 0);
-                hr_update_ext_status(vol, di->index, HR_EXT_MISSING);
-
-                assert(vol->hotspare_no < HR_MAX_HOTSPARES + HR_MAX_EXTENTS);
-        }
-
-        for (size_t i = 0; i < HR_MAX_EXTENTS; i++) {
-                hr_deferred_invalidation_t *di = &vol->deferred_inval[i];
-                if (di->svc_id != 0) {
-                        list_remove(&di->link);
-                        di->svc_id = 0;
-                }
-        }
-
-        fibril_mutex_unlock(&vol->hotspare_lock);
-        fibril_rwlock_write_unlock(&vol->states_lock);
-        fibril_rwlock_write_unlock(&vol->extents_lock);
-        vol->halt_please = false;
-        fibril_mutex_unlock(&vol->halt_lock);
-}
-
 /** @}
  */

uspace/srv/bd/hr/util.c

@@ -410 +410 @@
 }
 
+void hr_process_deferred_invalidations(hr_volume_t *vol)
+{
+        HR_DEBUG("hr_raid1_update_vol_status(): deferred invalidations\n");
+
+        fibril_mutex_lock(&vol->halt_lock);
+        vol->halt_please = true;
+        fibril_rwlock_write_lock(&vol->extents_lock);
+        fibril_rwlock_write_lock(&vol->states_lock);
+        fibril_mutex_lock(&vol->hotspare_lock);
+
+        list_foreach(vol->deferred_invalidations_list, link,
+            hr_deferred_invalidation_t, di) {
+                assert(vol->extents[di->index].status == HR_EXT_INVALID);
+
+                HR_DEBUG("moving invalidated extent no. %lu to hotspares\n",
+                    di->index);
+
+                block_fini(di->svc_id);
+
+                size_t hs_idx = vol->hotspare_no;
+
+                vol->hotspare_no++;
+
+                hr_update_hotspare_svc_id(vol, hs_idx, di->svc_id);
+                hr_update_hotspare_status(vol, hs_idx, HR_EXT_HOTSPARE);
+
+                hr_update_ext_svc_id(vol, di->index, 0);
+                hr_update_ext_status(vol, di->index, HR_EXT_MISSING);
+
+                assert(vol->hotspare_no < HR_MAX_HOTSPARES + HR_MAX_EXTENTS);
+        }
+
+        for (size_t i = 0; i < HR_MAX_EXTENTS; i++) {
+                hr_deferred_invalidation_t *di = &vol->deferred_inval[i];
+                if (di->svc_id != 0) {
+                        list_remove(&di->link);
+                        di->svc_id = 0;
+                }
+        }
+
+        fibril_mutex_unlock(&vol->hotspare_lock);
+        fibril_rwlock_write_unlock(&vol->states_lock);
+        fibril_rwlock_write_unlock(&vol->extents_lock);
+        vol->halt_please = false;
+        fibril_mutex_unlock(&vol->halt_lock);
+}
+
 /** @}
  */

uspace/srv/bd/hr/util.h

@@ -67 +67 @@
     uint64_t);
 extern void hr_range_lock_release(hr_range_lock_t *rl);
+extern void hr_process_deferred_invalidations(hr_volume_t *);
 
 #endif