Changeset 10291a23 in mainline

Timestamp:

2025-04-20T14:50:11Z (7 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

f09b75b

Parents:

afec52b4

git-author:

Miroslav Cimerman <mc@…> (2025-04-20 14:48:24)

git-committer:

Miroslav Cimerman <mc@…> (2025-04-20 14:50:11)

Message:

hr: FreeBSD GEOM::MIRROR metadata support

Location:

uspace/srv/bd/hr

Files:

• meson.build (modified) (1 diff)
• metadata/foreign/geom/g_mirror.h (added)
• metadata/foreign/geom/mirror.c (added)
• metadata/native.c (modified) (4 diffs)
• superblock.c (modified) (2 diffs)
• superblock.h (modified) (2 diffs)

uspace/srv/bd/hr/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'block', 'device' ]
+deps = [ 'block', 'crypto', 'device' ]
 src = files(
             'fge.c',
             'hr.c',
             'io.c',
+            'metadata/foreign/geom/mirror.c',
             'metadata/native.c',
             'raid0.c',

uspace/srv/bd/hr/metadata/native.c

@@ -57 +57 @@
 static errno_t           meta_native_init_meta2vol(const list_t *,
     hr_volume_t *);
-static void              meta_native_encode(const void *, void *);
-static void              meta_native_decode(const void *, void *);
+static void              meta_native_encode(void *, void *);
+static errno_t           meta_native_decode(const void *, void *);
 static errno_t           meta_native_get_block(service_id_t, void **);
 static errno_t           meta_native_write_block(service_id_t, const void *);
@@ -192 +192 @@
 }
 
-static void meta_native_encode(const void *md_v, void *block)
+static void meta_native_encode(void *md_v, void *block)
 {
         HR_DEBUG("%s()", __func__);
@@ -225 +225 @@
 }
 
-static void meta_native_decode(const void *block, void *md_v)
+static errno_t meta_native_decode(const void *block, void *md_v)
 {
         HR_DEBUG("%s()", __func__);
@@ -255 +255 @@
         metadata->bsize = uint32_t_le2host(scratch_md.bsize);
         memcpy(metadata->devname, scratch_md.devname, HR_DEVNAME_LEN);
+
+        return EOK;
 }
 

uspace/srv/bd/hr/superblock.c

@@ -46 +46 @@
 #include <str.h>
 
-#include "metadata/native.h"
 #include "superblock.h"
 #include "util.h"
 #include "var.h"
 
+#include "metadata/foreign/geom/g_mirror.h"
+#include "metadata/native.h"
+
 extern hr_superblock_ops_t metadata_native_ops;
+extern hr_superblock_ops_t metadata_gmirror_ops;
 
 static hr_superblock_ops_t *hr_superblock_ops_all[] = {
-        [HR_METADATA_NATIVE] = &metadata_native_ops
+        [HR_METADATA_NATIVE] = &metadata_native_ops,
+        [HR_METADATA_GEOM_MIRROR] = &metadata_gmirror_ops
 };
 
@@ -96 +100 @@
                 }
 
-                meta_ops->decode(meta_block, metadata_struct);
+                rc = meta_ops->decode(meta_block, metadata_struct);
 
                 free(meta_block);
+
+                if (rc != EOK) {
+                        free(metadata_struct);
+                        continue;
+                }
 
                 if (!meta_ops->has_valid_magic(metadata_struct)) {

uspace/srv/bd/hr/superblock.h

@@ -43 +43 @@
 typedef enum {
         HR_METADATA_NATIVE      = 0,
-        HR_METADATA_LAST_DUMMY  = 1
+        HR_METADATA_GEOM_MIRROR = 1,
+        HR_METADATA_LAST_DUMMY  = 2
 } metadata_type_t;
 
@@ -52 +53 @@
         errno_t          (*init_vol2meta)(const hr_volume_t *, void *);
         errno_t          (*init_meta2vol)(const list_t *, hr_volume_t *);
-        void             (*encode)(const void *, void *);
-        void             (*decode)(const void *, void *);
+        void             (*encode)(void *, void *);
+        errno_t          (*decode)(const void *, void *);
         errno_t          (*get_block)(service_id_t, void **);
         errno_t          (*write_block)(service_id_t, const void *);