Changeset 137f7cf5 in mainline

Timestamp:

2025-06-17T22:29:10Z (4 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

3c518fc

Parents:

a3486f2

git-author:

Miroslav Cimerman <mc@…> (2025-06-17 22:04:20)

git-committer:

Miroslav Cimerman <mc@…> (2025-06-17 22:29:10)

Message:

hr: add common hr_sync_extents() fcn

Location:

uspace/srv/bd/hr

Files:

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

uspace/srv/bd/hr/hr.c

@@ -354 +354 @@
         }
 
-        hr_extent_t *ext = &vol->extents[extent_idx_to_fail];
-
         fibril_rwlock_read_lock(&vol->extents_lock);
         fibril_rwlock_write_lock(&vol->states_lock);
+
+        hr_extent_t *ext = &vol->extents[extent_idx_to_fail];
 
         switch (ext->state) {

uspace/srv/bd/hr/raid0.c

@@ -208 +208 @@
 static errno_t hr_raid0_bd_sync_cache(bd_srv_t *bd, aoff64_t ba, size_t cnt)
 {
-        return hr_raid0_bd_op(HR_BD_SYNC, bd, ba, cnt, NULL, NULL, 0);
+        hr_volume_t *vol = bd->srvs->sarg;
+
+        return hr_sync_extents(vol);
 }
 

uspace/srv/bd/hr/raid1.c

@@ -263 +263 @@
 static errno_t hr_raid1_bd_sync_cache(bd_srv_t *bd, aoff64_t ba, size_t cnt)
 {
-        return hr_raid1_bd_op(HR_BD_SYNC, bd, ba, cnt, NULL, NULL, 0);
+        hr_volume_t *vol = bd->srvs->sarg;
+
+        return hr_sync_extents(vol);
 }
 
@@ -310 +312 @@
 
         return count;
-
 }
 

uspace/srv/bd/hr/raid5.c

@@ -219 +219 @@
 static errno_t hr_raid5_bd_sync_cache(bd_srv_t *bd, aoff64_t ba, size_t cnt)
 {
-        /* XXX */
-        return EOK;
+        hr_volume_t *vol = bd->srvs->sarg;
+
+        return hr_sync_extents(vol);
 }
 

uspace/srv/bd/hr/util.c

@@ -1100 +1100 @@
 }
 
+errno_t hr_sync_extents(hr_volume_t *vol)
+{
+        errno_t rc = EOK;
+
+        fibril_rwlock_read_lock(&vol->extents_lock);
+        for (size_t e = 0; e < vol->extent_no; e++) {
+                fibril_rwlock_read_lock(&vol->states_lock);
+                hr_ext_state_t s = vol->extents[e].state;
+                fibril_rwlock_read_unlock(&vol->states_lock);
+
+                service_id_t svc_id = vol->extents[e].svc_id;
+
+                if (s == HR_EXT_ONLINE || s == HR_EXT_REBUILD) {
+                        errno_t rc = hr_sync_cache(svc_id, 0, 0);
+                        if (rc != EOK && rc != ENOTSUP)
+                                vol->hr_ops.ext_state_cb(vol, e, rc);
+                }
+        }
+        fibril_rwlock_read_unlock(&vol->extents_lock);
+
+        vol->hr_ops.vol_state_eval(vol);
+
+        fibril_rwlock_read_lock(&vol->states_lock);
+        hr_vol_state_t s = vol->state;
+        fibril_rwlock_read_unlock(&vol->states_lock);
+
+        if (s == HR_VOL_FAULTY)
+                rc = EIO;
+
+        return rc;
+}
+
 /** @}
  */

uspace/srv/bd/hr/util.h

@@ -111 +111 @@
 extern errno_t hr_util_add_hotspare(hr_volume_t *, service_id_t);
 extern void hr_raid5_xor(void *, const void *, size_t);
+extern errno_t hr_sync_extents(hr_volume_t *);
 
 #endif