Changeset 65706f1 in mainline for uspace/srv/bd/hr/raid4.c

Timestamp:

2024-11-27T14:06:41Z (8 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

a0c3080

Parents:

40bf2c6

Message:

hr: rename dev_no → extent_no in hr_volume_t

File:

• uspace/srv/bd/hr/raid4.c (modified) (13 diffs)

uspace/srv/bd/hr/raid4.c

@@ -100 +100 @@
         assert(new_volume->level == HR_LVL_4);
 
-        if (new_volume->dev_no < 3) {
+        if (new_volume->extent_no < 3) {
                 HR_ERROR("RAID 4 array needs at least 3 devices\n");
                 return EINVAL;
@@ -133 +133 @@
         vol->bsize = bsize;
         vol->data_offset = HR_DATA_OFF;
-        vol->data_blkno = vol->nblocks - (vol->data_offset * vol->dev_no) -
-            (vol->nblocks / vol->dev_no);
+        vol->data_blkno = vol->nblocks - (vol->data_offset * vol->extent_no) -
+            (vol->nblocks / vol->extent_no);
         vol->strip_size = HR_STRIP_SIZE;
 
@@ -242 +242 @@
 static ssize_t hr_raid4_get_bad_ext(hr_volume_t *vol)
 {
-        for (size_t i = 0; i < vol->dev_no; i++)
+        for (size_t i = 0; i < vol->extent_no; i++)
                 if (vol->extents[i].status != HR_EXT_ONLINE)
                         return i;
@@ -252 +252 @@
         hr_vol_status_t old_state = vol->status;
         size_t bad = 0;
-        for (size_t i = 0; i < vol->dev_no; i++)
+        for (size_t i = 0; i < vol->extent_no; i++)
                 if (vol->extents[i].status != HR_EXT_ONLINE)
                         bad++;
@@ -334 +334 @@
         /* read all other extents in the stripe */
         bool first = true;
-        for (i = 0; i < vol->dev_no; i++) {
+        for (i = 0; i < vol->extent_no; i++) {
                 if (i == bad)
                         continue;
@@ -404 +404 @@
                  */
                 bool first = true;
-                for (i = 1; i < vol->dev_no; i++) {
+                for (i = 1; i < vol->extent_no; i++) {
                         if (i == (size_t)bad)
                                 continue;
@@ -487 +487 @@
          */
         bool first = true;
-        for (i = 1; i < vol->dev_no; i++) {
+        for (i = 1; i < vol->extent_no; i++) {
                 if (first) {
                         if (i == extent) {
@@ -547 +547 @@
         uint64_t strip_size = vol->strip_size / vol->bsize; /* in blocks */
         uint64_t stripe = (ba / strip_size); /* stripe number */
-        uint64_t extent = (stripe % (vol->dev_no - 1)) + 1;
-        uint64_t ext_stripe = stripe / (vol->dev_no - 1); /* stripe level */
+        uint64_t extent = (stripe % (vol->extent_no - 1)) + 1;
+        uint64_t ext_stripe = stripe / (vol->extent_no - 1); /* stripe level */
         uint64_t strip_off = ba % strip_size; /* strip offset */
 
@@ -626 +626 @@
                 strip_off = 0;
                 extent++;
-                if (extent >= vol->dev_no) {
+                if (extent >= vol->extent_no) {
                         ext_stripe++;
                         extent = 1;
@@ -655 +655 @@
         }
 
-        size_t bad = vol->dev_no;
-        for (size_t i = 0; i < vol->dev_no; i++) {
+        size_t bad = vol->extent_no;
+        for (size_t i = 0; i < vol->extent_no; i++) {
                 if (vol->extents[i].status == HR_EXT_FAILED) {
                         bad = i;
@@ -663 +663 @@
         }
 
-        if (bad == vol->dev_no) {
+        if (bad == vol->extent_no) {
                 HR_WARN("hr_raid4_rebuild(): no bad extent on \"%s\", "
                     "aborting rebuild\n", vol->devname);
@@ -699 +699 @@
 
         uint64_t max_blks = DATA_XFER_LIMIT / vol->bsize;
-        uint64_t left = vol->data_blkno / (vol->dev_no - 1);
+        uint64_t left = vol->data_blkno / (vol->extent_no - 1);
         buf = malloc(max_blks * vol->bsize);
         xorbuf = malloc(max_blks * vol->bsize);
@@ -714 +714 @@
                  */
                 bool first = true;
-                for (size_t i = 0; i < vol->dev_no; i++) {
+                for (size_t i = 0; i < vol->extent_no; i++) {
                         if (i == bad)
                                 continue;