Changeset 00d80c6 in mainline

Timestamp:

2025-05-08T17:41:46Z (7 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

dbb1e3f

Parents:

2f21cd4

Message:

hr: raid5.c: REBUILD fix

Make it work until RAID 5 rewrite is complete.

File:

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

uspace/srv/bd/hr/raid5.c

@@ -831 +831 @@
                  * 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);
+
+                /*
+                 * fibril_rwlock_write_unlock(&vol->states_lock);
+                 * fibril_mutex_unlock(&vol->lock);
+                 * fibril_mutex_lock(&vol->lock);
+                 * fibril_rwlock_write_lock(&vol->states_lock);
+                 */
         }
 
@@ -841 +844 @@
 
         hr_update_ext_state(vol, bad, HR_EXT_ONLINE);
-
-        rc = vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
-
-end:
-        (void)hr_raid5_update_vol_state(vol);
 
         fibril_rwlock_write_unlock(&vol->states_lock);
@@ -851 +849 @@
         fibril_mutex_unlock(&vol->lock);
 
+        rc = vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
+
+        fibril_mutex_lock(&vol->lock);
+        fibril_rwlock_read_lock(&vol->extents_lock);
+        fibril_rwlock_write_lock(&vol->states_lock);
+
+end:
+        (void)hr_raid5_update_vol_state(vol);
+
+        fibril_rwlock_write_unlock(&vol->states_lock);
+        fibril_rwlock_read_unlock(&vol->extents_lock);
+        fibril_mutex_unlock(&vol->lock);
+
         if (buf != NULL)
                 free(buf);