Changeset 7fba146 in mainline for uspace/srv/bd/hr/metadata/foreign

Timestamp:

2025-06-09T23:41:50Z (10 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

6791fbf

Parents:

83ff12f

Message:

hr: RAID 1: inc meta counter on first write

Location:

uspace/srv/bd/hr/metadata/foreign

Files:

• geom/hr_g_mirror.c (modified) (2 diffs)
• geom/hr_g_stripe.c (modified) (2 diffs)
• softraid/hr_softraid.c (modified) (2 diffs)

uspace/srv/bd/hr/metadata/foreign/geom/hr_g_mirror.c

@@ -62 +62 @@
 static bool meta_gmirror_has_valid_magic(const void *);
 static bool meta_gmirror_compare_uuids(const void *, const void *);
-static void meta_gmirror_inc_counter(void *);
+static void meta_gmirror_inc_counter(hr_volume_t *);
 static errno_t meta_gmirror_save(hr_volume_t *, bool);
 static const char *meta_gmirror_get_devname(const void *);
@@ -284 +284 @@
 }
 
-static void meta_gmirror_inc_counter(void *md_v)
-{
-        struct g_mirror_metadata *md = md_v;
+static void meta_gmirror_inc_counter(hr_volume_t *vol)
+{
+        fibril_mutex_lock(&vol->md_lock);
+
+        struct g_mirror_metadata *md = vol->in_mem_md;
 
         /* XXX: probably md_genid and not md_syncid is incremented */
         md->md_genid++;
+
+        fibril_mutex_unlock(&vol->md_lock);
 }
 

uspace/srv/bd/hr/metadata/foreign/geom/hr_g_stripe.c

@@ -62 +62 @@
 static bool meta_gstripe_has_valid_magic(const void *);
 static bool meta_gstripe_compare_uuids(const void *, const void *);
-static void meta_gstripe_inc_counter(void *);
+static void meta_gstripe_inc_counter(hr_volume_t *);
 static errno_t meta_gstripe_save(hr_volume_t *, bool);
 static const char *meta_gstripe_get_devname(const void *);
@@ -286 +286 @@
 }
 
-static void meta_gstripe_inc_counter(void *md_v)
-{
-        (void)md_v;
+static void meta_gstripe_inc_counter(hr_volume_t *vol)
+{
+        (void)vol;
 }
 

uspace/srv/bd/hr/metadata/foreign/softraid/hr_softraid.c

@@ -62 +62 @@
 static bool meta_softraid_has_valid_magic(const void *);
 static bool meta_softraid_compare_uuids(const void *, const void *);
-static void meta_softraid_inc_counter(void *);
+static void meta_softraid_inc_counter(hr_volume_t *);
 static errno_t meta_softraid_save(hr_volume_t *, bool);
 static const char *meta_softraid_get_devname(const void *);
@@ -419 +419 @@
 }
 
-static void meta_softraid_inc_counter(void *md_v)
-{
-        struct sr_metadata *md = md_v;
+static void meta_softraid_inc_counter(hr_volume_t *vol)
+{
+        fibril_mutex_lock(&vol->md_lock);
+
+        struct sr_metadata *md = vol->in_mem_md;
 
         md->ssd_ondisk++;
+
+        fibril_mutex_unlock(&vol->md_lock);
 }