Changeset 8b51009 in mainline for uspace/srv/bd/hr/superblock.h

Timestamp:

2025-03-28T23:37:16Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

0437dd5

Parents:

7bfe468

git-author:

Miroslav Cimerman <mc@…> (2025-03-28 23:25:57)

git-committer:

Miroslav Cimerman <mc@…> (2025-03-28 23:37:16)

Message:

hr: auto assembly, refactor

Added automatic assembly (with hrctl -A). All disks or their partitions
are scanned for HelenRAID metadata and assembly is attempted.

Main volume list is now locked with RW lock. The volume list
manipulation functions are moved into util.c.

hr_{create,destroy}_vol_struct() are implemented for better reusability
and modularity.

Volume destroy/stop (hrctl -D) now returns EBUSY if someone has still
the volume open()-ed.

File:

• uspace/srv/bd/hr/superblock.h (modified) (2 diffs)

uspace/srv/bd/hr/superblock.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Miroslav Cimerman
+ * Copyright (c) 2025 Miroslav Cimerman
  * All rights reserved.
  *
@@ -39 +39 @@
 #include "var.h"
 
-#define HR_META_SIZE 1  /* in blocks */
-#define HR_META_OFF 7   /* in blocks */
-#define HR_DATA_OFF (HR_META_SIZE + HR_META_OFF)
+#define HR_META_SIZE            1       /* in blocks */
+#define HR_META_OFF             7       /* in blocks */
+#define HR_DATA_OFF             (HR_META_OFF + HR_META_SIZE)
 
-#define HR_MAGIC 0x4420492041205248LLU
-#define HR_UUID_LEN 16
+#define HR_MAGIC_STR            "HelenRAID"
+#define HR_MAGIC_SIZE           16
+#define HR_UUID_LEN             16
+/* #define HR_METADATA_VERSION 0 */
 
-typedef struct hr_metadata {
-        uint64_t magic;
-        uint32_t version;       /* unused XXX */
-        uint32_t extent_no;
+typedef struct hr_metadata hr_metadata_t;
+typedef struct hr_volume hr_volume_t;
 
-        uint32_t index;         /* index of disk in array */
-        uint32_t level;
-        uint32_t layout;
-        uint32_t strip_size;
+struct hr_metadata {
+        char            magic[HR_MAGIC_SIZE];
 
-        uint64_t nblocks;       /* all blocks */
-        uint64_t data_blkno;    /* usable blocks */
+        uint8_t         uuid[HR_UUID_LEN];
 
-        uint64_t data_offset;   /* block where data starts */
+        /* TODO: change to blkno */
+        uint64_t        nblocks;                /* all blocks */
+        uint64_t        data_blkno;             /* usable blocks */
 
-        uint64_t counter; /* unused */
+        uint64_t        truncated_blkno;        /* usable blocks */
+        uint64_t        data_offset;
 
-        uint8_t uuid[HR_UUID_LEN];
+        uint64_t        counter;                /* yet unused */
+        uint32_t        version;                /* yet unused */
+        uint32_t        extent_no;
 
-        char devname[HR_DEVNAME_LEN];
-} hr_metadata_t;
+        uint32_t        index;                  /* index of extent in volume */
+        uint32_t        level;
+        uint32_t        layout;
+        uint32_t        strip_size;
 
-extern errno_t hr_write_meta_to_vol(hr_volume_t *);
-extern errno_t hr_write_meta_to_ext(hr_volume_t *, size_t);
-extern errno_t hr_fill_vol_from_meta(hr_volume_t *);
+        uint32_t        bsize;
+
+        char            devname[HR_DEVNAME_LEN];
+};
+
+extern errno_t  hr_write_meta_to_vol(hr_volume_t *);
+extern errno_t  hr_write_meta_to_ext(hr_volume_t *, size_t);
+extern errno_t  hr_fill_vol_from_meta(hr_volume_t *);
+extern errno_t  hr_get_metadata_block(service_id_t, void **);
+extern void     hr_decode_metadata_from_block(void *, hr_metadata_t *);
+extern void     hr_metadata_dump(hr_metadata_t *);
+extern bool     hr_valid_md_magic(hr_metadata_t *);
 
 #endif