Changeset 234212a in mainline

Timestamp:

2025-06-17T13:22:46Z (5 days ago)

Author:

Miroslav Cimerman <mc@…>

Children:

f0950d2

Parents:

a62079d

Message:

hr: rename data_dirty to first_write

Location:

uspace/srv/bd/hr

Files:

• raid1.c (modified) (7 diffs)
• util.c (modified) (2 diffs)
• util.h (modified) (1 diff)
• var.h (modified) (1 diff)

uspace/srv/bd/hr/raid1.c

@@ -162 +162 @@
 }
 
-void hr_raid1_ext_state_cb(hr_volume_t *vol, size_t extent,
-    errno_t rc)
-{
-        HR_DEBUG("%s()", __func__);
+void hr_raid1_ext_state_cb(hr_volume_t *vol, size_t extent, errno_t rc)
+{
+        HR_DEBUG("%s()", __func__);
+
+        assert(fibril_rwlock_is_locked(&vol->extents_lock));
 
         if (rc == EOK)
                 return;
-
-        assert(fibril_rwlock_is_locked(&vol->extents_lock));
 
         fibril_rwlock_write_lock(&vol->states_lock);
@@ -219 +218 @@
                 if (old_state != HR_VOL_REBUILD) {
                         /* XXX: allow REBUILD on INVALID extents */
-                        if (vol->hotspare_no > 0) {
+                        fibril_mutex_lock(&vol->hotspare_lock);
+                        size_t hs_no = vol->hotspare_no;
+                        fibril_mutex_unlock(&vol->hotspare_lock);
+                        if (hs_no > 0) {
                                 fid_t fib = fibril_create(hr_raid1_rebuild,
                                     vol);
@@ -322 +324 @@
         uint64_t rebuild_blk;
 
+        if (size < cnt * vol->bsize)
+                return EINVAL;
+
         fibril_rwlock_read_lock(&vol->states_lock);
         hr_vol_state_t vol_state = vol->state;
@@ -332 +337 @@
         bool exp = false;
         if (type == HR_BD_WRITE &&
-            atomic_compare_exchange_strong(&vol->data_dirty, &exp, true)) {
+            atomic_compare_exchange_strong(&vol->first_write, &exp, true)) {
                 vol->meta_ops->inc_counter(vol);
                 vol->meta_ops->save(vol, WITH_STATE_CALLBACK);
         }
-
-        if (type == HR_BD_READ || type == HR_BD_WRITE)
-                if (size < cnt * vol->bsize)
-                        return EINVAL;
 
         rc = hr_check_ba_range(vol, cnt, ba);
@@ -346 +347 @@
 
         /* allow full dev sync */
-        if (type != HR_BD_SYNC || ba != 0)
-                hr_add_ba_offset(vol, &ba);
+        if (!(type == HR_BD_SYNC && ba == 0 && cnt == 0))
+                hr_add_data_offset(vol, &ba);
 
         /*
@@ -491 +492 @@
         size_t cnt;
         uint64_t ba = 0;
-        hr_add_ba_offset(vol, &ba);
+        hr_add_data_offset(vol, &ba);
 
         /*
@@ -501 +502 @@
         /* increment metadata counter only on first write */
         bool exp = false;
-        if (atomic_compare_exchange_strong(&vol->data_dirty, &exp, true)) {
+        if (atomic_compare_exchange_strong(&vol->first_write, &exp, true)) {
                 vol->meta_ops->inc_counter(vol);
                 vol->meta_ops->save(vol, WITH_STATE_CALLBACK);

uspace/srv/bd/hr/util.c

@@ -152 +152 @@
 
         atomic_init(&vol->state_dirty, false);
-        atomic_init(&vol->data_dirty, false);
+        atomic_init(&vol->first_write, false);
         atomic_init(&vol->rebuild_blk, 0);
         atomic_init(&vol->open_cnt, 0);
@@ -397 +397 @@
 }
 
-void hr_add_ba_offset(hr_volume_t *vol, uint64_t *ba)
+void hr_add_data_offset(hr_volume_t *vol, uint64_t *ba)
 {
         *ba = *ba + vol->data_offset;
+}
+
+void hr_sub_data_offset(hr_volume_t *vol, uint64_t *ba)
+{
+        *ba = *ba - vol->data_offset;
 }
 

uspace/srv/bd/hr/util.h

@@ -87 +87 @@
 extern errno_t hr_register_volume(hr_volume_t *);
 extern errno_t hr_check_ba_range(hr_volume_t *, size_t, uint64_t);
-extern void hr_add_ba_offset(hr_volume_t *, uint64_t *);
+extern void hr_add_data_offset(hr_volume_t *, uint64_t *);
+extern void hr_sub_data_offset(hr_volume_t *, uint64_t *);
 extern void hr_update_ext_state(hr_volume_t *, size_t, hr_ext_state_t);
 extern void hr_update_hotspare_state(hr_volume_t *, size_t, hr_ext_state_t);

uspace/srv/bd/hr/var.h

@@ -105 +105 @@
          * allowing non-destructive read-only access
          */
-        _Atomic bool data_dirty;
+        _Atomic bool first_write;
 
-        /* XXX: atomic_uint_least64_t? */
         _Atomic uint64_t rebuild_blk; /* rebuild position */
         _Atomic int open_cnt; /* open/close() counter */