Changeset b5c95da5 in mainline

Timestamp:

2025-06-09T22:40:41Z (3 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

177f6ff

Parents:

9ee9c60b

Message:

hr: raid*_{create,init}(): replace asserts with EINVAL

Location:

uspace/srv/bd/hr

Files:

• raid0.c (modified) (2 diffs)
• raid1.c (modified) (2 diffs)
• raid5.c (modified) (2 diffs)

uspace/srv/bd/hr/raid0.c

@@ -83 +83 @@
         HR_DEBUG("%s()", __func__);
 
-        assert(new_volume->level == HR_LVL_0);
+        if (new_volume->level != HR_LVL_0)
+                return EINVAL;
 
         if (new_volume->extent_no < 2) {
@@ -111 +112 @@
         HR_DEBUG("%s()", __func__);
 
-        assert(vol->level == HR_LVL_0);
+        if (vol->level != HR_LVL_0)
+                return EINVAL;
 
         uint64_t total_blkno = vol->truncated_blkno * vol->extent_no;

uspace/srv/bd/hr/raid1.c

@@ -93 +93 @@
         HR_DEBUG("%s()", __func__);
 
-        assert(new_volume->level == HR_LVL_1);
+        if (new_volume->level != HR_LVL_1)
+                return EINVAL;
 
         if (new_volume->extent_no < 2) {
@@ -127 +128 @@
         HR_DEBUG("%s()", __func__);
 
-        assert(vol->level == HR_LVL_1);
+        if (vol->level != HR_LVL_1)
+                return EINVAL;
 
         vol->data_offset = vol->meta_ops->get_data_offset();

uspace/srv/bd/hr/raid5.c

@@ -96 +96 @@
         HR_DEBUG("%s()", __func__);
 
-        assert(new_volume->level == HR_LVL_5 || new_volume->level == HR_LVL_4);
+        if (new_volume->level != HR_LVL_5 && new_volume->level != HR_LVL_4)
+                return EINVAL;
 
         if (new_volume->extent_no < 3) {
@@ -129 +130 @@
         HR_DEBUG("%s()", __func__);
 
-        assert(vol->level == HR_LVL_5 || vol->level == HR_LVL_4);
+        if (vol->level != HR_LVL_5 && vol->level != HR_LVL_4)
+                return EINVAL;
 
         uint64_t total_blkno = vol->truncated_blkno * vol->extent_no;