Changeset 0fce1a6 in mainline for uspace/srv/bd/hr/raid5.c

Timestamp:

2025-06-09T21:24:57Z (4 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

9ee9c60b

Parents:

eabc094c

Message:

hr: rename HR_RLQ_* to HR_LAYOUT_*

File:

• uspace/srv/bd/hr/raid5.c (modified) (4 diffs)

uspace/srv/bd/hr/raid5.c

@@ -142 +142 @@
         vol->strip_size = HR_STRIP_SIZE;
 
-        vol->layout = HR_RLQ_RAID5_NR;
+        vol->layout = HR_LAYOUT_RAID5_NR;
 
         return EOK;
@@ -559 +559 @@
         /* parity extent */
         uint64_t p_extent;
-        if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_0) {
+        if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_0) {
                 p_extent = 0;
-        } else if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_N) {
+        } else if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_N) {
                 p_extent = vol->extent_no - 1;
-        } else if (level == HR_LVL_5 && layout == HR_RLQ_RAID5_0R) {
+        } else if (level == HR_LVL_5 && layout == HR_LAYOUT_RAID5_0R) {
                 p_extent = (stripe / (vol->extent_no - 1)) % vol->extent_no;
         } else if (level == HR_LVL_5 &&
-            (layout == HR_RLQ_RAID5_NR || layout == HR_RLQ_RAID5_NC)) {
+            (layout == HR_LAYOUT_RAID5_NR || layout == HR_LAYOUT_RAID5_NC)) {
                 p_extent = (vol->extent_no - 1) -
                     (stripe / (vol->extent_no - 1)) % vol->extent_no;
@@ -574 +574 @@
 
         uint64_t extent;
-        if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_0) {
+        if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_0) {
                 extent = (stripe % (vol->extent_no - 1)) + 1;
-        } else if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_N) {
+        } else if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_N) {
                 extent = stripe % (vol->extent_no - 1);
         } else if (level == HR_LVL_5 &&
-            (layout == HR_RLQ_RAID5_0R || layout == HR_RLQ_RAID5_NR)) {
+            (layout == HR_LAYOUT_RAID5_0R || layout == HR_LAYOUT_RAID5_NR)) {
                 if ((stripe % (vol->extent_no - 1)) < p_extent)
                         extent = stripe % (vol->extent_no - 1);
                 else
                         extent = (stripe % (vol->extent_no - 1)) + 1;
-        } else if (level == HR_LVL_5 && layout == HR_RLQ_RAID5_NC) {
+        } else if (level == HR_LVL_5 && layout == HR_LAYOUT_RAID5_NC) {
                 extent =
                     ((stripe % (vol->extent_no - 1)) + p_extent + 1) %
@@ -675 +675 @@
                 ext_stripe = stripe / (vol->extent_no - 1); /* stripe level */
 
-                if (level == HR_LVL_5 && layout == HR_RLQ_RAID5_0R) {
+                if (level == HR_LVL_5 && layout == HR_LAYOUT_RAID5_0R) {
                         p_extent =
                             (stripe / (vol->extent_no - 1)) % vol->extent_no;
                 } else if (level == HR_LVL_5 &&
-                    (layout == HR_RLQ_RAID5_NR || layout == HR_RLQ_RAID5_NC)) {
+                    (layout == HR_LAYOUT_RAID5_NR || layout == HR_LAYOUT_RAID5_NC)) {
                         p_extent = (vol->extent_no - 1) -
                             (stripe / (vol->extent_no - 1)) % vol->extent_no;
                 }
 
-                if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_0) {
+                if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_0) {
                         extent = (stripe % (vol->extent_no - 1)) + 1;
-                } else if (level == HR_LVL_4 && layout == HR_RLQ_RAID4_N) {
+                } else if (level == HR_LVL_4 && layout == HR_LAYOUT_RAID4_N) {
                         extent = stripe % (vol->extent_no - 1);
                 } else if (level == HR_LVL_5 &&
-                    (layout == HR_RLQ_RAID5_0R || layout == HR_RLQ_RAID5_NR)) {
+                    (layout == HR_LAYOUT_RAID5_0R || layout == HR_LAYOUT_RAID5_NR)) {
                         if ((stripe % (vol->extent_no - 1)) < p_extent)
                                 extent = stripe % (vol->extent_no - 1);
                         else
                                 extent = (stripe % (vol->extent_no - 1)) + 1;
-                } else if (level == HR_LVL_5 && layout == HR_RLQ_RAID5_NC) {
+                } else if (level == HR_LVL_5 && layout == HR_LAYOUT_RAID5_NC) {
                         extent =
                             ((stripe % (vol->extent_no - 1)) + p_extent + 1) %