Changeset f1be66bf in mainline

Timestamp:

2025-03-06T21:47:13Z (2 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

d2da1be

Parents:

d6fe2a1

Message:

hr: raid5.c: fast patch to make new asserts pass

File:

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

uspace/srv/bd/hr/raid5.c

@@ -102 +102 @@
         }
 
+        fibril_rwlock_write_lock(&new_volume->states_lock);
+
         rc = hr_raid5_update_vol_status(new_volume);
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_rwlock_write_unlock(&new_volume->states_lock);
                 return rc;
+        }
 
         bd_srvs_init(&new_volume->hr_bds);
@@ -111 +115 @@
 
         rc = hr_register_volume(new_volume);
+
+        fibril_rwlock_write_unlock(&new_volume->states_lock);
 
         return rc;
@@ -140 +146 @@
 {
         fibril_mutex_lock(&vol->lock);
+        fibril_rwlock_write_lock(&vol->states_lock);
         (void)hr_raid5_update_vol_status(vol);
+        fibril_rwlock_write_unlock(&vol->states_lock);
         fibril_mutex_unlock(&vol->lock);
 }
@@ -149 +157 @@
 
         fibril_mutex_lock(&vol->lock);
+        fibril_mutex_lock(&vol->hotspare_lock);
 
         if (vol->hotspare_no >= HR_MAX_HOTSPARES) {
@@ -158 +167 @@
 
         vol->hotspares[vol->hotspare_no].svc_id = hotspare;
-        hr_update_hotspare_status(vol, vol->hotspare_no, HR_EXT_HOTSPARE);
 
         vol->hotspare_no++;
+
+        hr_update_hotspare_status(vol, vol->hotspare_no - 1, HR_EXT_HOTSPARE);
 
         /*
@@ -169 +179 @@
                     "spawning new rebuild fibril\n");
                 fid_t fib = fibril_create(hr_raid5_rebuild, vol);
-                if (fib == 0)
+                if (fib == 0) {
+                        fibril_mutex_unlock(&vol->hotspare_lock);
+                        fibril_mutex_unlock(&vol->lock);
                         return ENOMEM;
+                }
                 fibril_start(fib);
                 fibril_detach(fib);
         }
 
+        fibril_mutex_unlock(&vol->hotspare_lock);
         fibril_mutex_unlock(&vol->lock);
 
@@ -587 +601 @@
         left = cnt;
 
+        fibril_rwlock_write_lock(&vol->states_lock);
         while (left != 0) {
                 phys_block = ext_stripe * strip_size + strip_off;
@@ -684 +699 @@
 error:
         (void)hr_raid5_update_vol_status(vol);
+        fibril_rwlock_write_unlock(&vol->states_lock);
         fibril_mutex_unlock(&vol->lock);
         return rc;
@@ -697 +713 @@
 
         fibril_mutex_lock(&vol->lock);
+        fibril_rwlock_read_lock(&vol->extents_lock);
+        fibril_rwlock_write_lock(&vol->states_lock);
 
         if (vol->hotspare_no == 0) {
@@ -738 +756 @@
 
         vol->hotspares[hotspare_idx].svc_id = 0;
+        fibril_mutex_lock(&vol->hotspare_lock);
         hr_update_hotspare_status(vol, hotspare_idx, HR_EXT_MISSING);
+        fibril_mutex_unlock(&vol->hotspare_lock);
 
         vol->hotspare_no--;
@@ -813 +833 @@
                  * during rebuild.
                  */
+                fibril_rwlock_write_unlock(&vol->states_lock);
                 fibril_mutex_unlock(&vol->lock);
                 fibril_mutex_lock(&vol->lock);
+                fibril_rwlock_write_lock(&vol->states_lock);
         }
 
@@ -829 +851 @@
         (void)hr_raid5_update_vol_status(vol);
 
+        fibril_rwlock_write_unlock(&vol->states_lock);
+        fibril_rwlock_read_unlock(&vol->extents_lock);
         fibril_mutex_unlock(&vol->lock);