Changeset 7fba146 in mainline for uspace/srv/bd/hr/raid1.c

Timestamp:

2025-06-09T23:41:50Z (2 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

6791fbf

Parents:

83ff12f

Message:

hr: RAID 1: inc meta counter on first write

File:

• uspace/srv/bd/hr/raid1.c (modified) (6 diffs)

uspace/srv/bd/hr/raid1.c

@@ -56 +56 @@
 #include "var.h"
 
+static void hr_raid1_vol_state_eval_forced(hr_volume_t *);
 static size_t hr_raid1_count_good_extents(hr_volume_t *, uint64_t, size_t,
     uint64_t);
@@ -105 +106 @@
         new_volume->hr_bds.sarg = new_volume;
 
-        /* force volume state update */
-        hr_mark_vol_state_dirty(new_volume);
-        hr_raid1_vol_state_eval(new_volume);
+        hr_raid1_vol_state_eval_forced(new_volume);
 
         fibril_rwlock_read_lock(&new_volume->states_lock);
@@ -155 +154 @@
         bool exp = true;
 
-        /* TODO: could also wrap this */
         if (!atomic_compare_exchange_strong(&vol->state_dirty, &exp, false))
                 return;
 
-        fibril_mutex_lock(&vol->md_lock);
-
-        vol->meta_ops->inc_counter(vol->in_mem_md);
-        /* XXX: save right away */
-
-        fibril_mutex_unlock(&vol->md_lock);
+        vol->meta_ops->inc_counter(vol);
+        (void)vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
+
+        hr_raid1_vol_state_eval_forced(vol);
+}
+
+void hr_raid1_ext_state_cb(hr_volume_t *vol, size_t extent,
+    errno_t rc)
+{
+        HR_DEBUG("%s()", __func__);
+
+        if (rc == EOK)
+                return;
+
+        assert(fibril_rwlock_is_locked(&vol->extents_lock));
+
+        fibril_rwlock_write_lock(&vol->states_lock);
+
+        switch (rc) {
+        case ENOMEM:
+                hr_update_ext_state(vol, extent, HR_EXT_INVALID);
+                break;
+        case ENOENT:
+                hr_update_ext_state(vol, extent, HR_EXT_MISSING);
+                break;
+        default:
+                hr_update_ext_state(vol, extent, HR_EXT_FAILED);
+        }
+
+        hr_mark_vol_state_dirty(vol);
+
+        fibril_rwlock_write_unlock(&vol->states_lock);
+}
+
+static void hr_raid1_vol_state_eval_forced(hr_volume_t *vol)
+{
+        HR_DEBUG("%s()", __func__);
 
         fibril_rwlock_read_lock(&vol->extents_lock);
@@ -209 +238 @@
 }
 
-void hr_raid1_ext_state_cb(hr_volume_t *vol, size_t extent,
-    errno_t rc)
-{
-        HR_DEBUG("%s()", __func__);
-
-        if (rc == EOK)
-                return;
-
-        assert(fibril_rwlock_is_locked(&vol->extents_lock));
-
-        fibril_rwlock_write_lock(&vol->states_lock);
-
-        switch (rc) {
-        case ENOMEM:
-                hr_update_ext_state(vol, extent, HR_EXT_INVALID);
-                break;
-        case ENOENT:
-                hr_update_ext_state(vol, extent, HR_EXT_MISSING);
-                break;
-        default:
-                hr_update_ext_state(vol, extent, HR_EXT_FAILED);
-        }
-
-        hr_mark_vol_state_dirty(vol);
-
-        fibril_rwlock_write_unlock(&vol->states_lock);
-}
-
 static errno_t hr_raid1_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
@@ -328 +329 @@
         if (vol_state == HR_VOL_FAULTY || vol_state == HR_VOL_NONE)
                 return EIO;
+
+        if (!vol->data_dirty && type == HR_BD_WRITE) {
+                vol->meta_ops->inc_counter(vol);
+                vol->data_dirty = true;
+        }
 
         if (type == HR_BD_READ || type == HR_BD_WRITE)
@@ -543 +549 @@
         fibril_rwlock_write_unlock(&vol->states_lock);
 
-        rc = vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
+        (void)vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
 
 end: