Changeset 65706f1 in mainline for uspace/srv/bd/hr/raid5.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/raid5.c (modified) (13 diffs)

uspace/srv/bd/hr/raid5.c

@@ -97 +97 @@
         assert(new_volume->level == HR_LVL_5);
 
-        if (new_volume->dev_no < 3) {
+        if (new_volume->extent_no < 3) {
                 HR_ERROR("RAID 5 array needs at least 3 devices\n");
                 return EINVAL;
@@ -130 +130 @@
         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;
 
@@ -239 +239 @@
 static ssize_t hr_raid5_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;
@@ -249 +249 @@
         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++;
@@ -331 +331 @@
         /* 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;
@@ -401 +401 @@
                  */
                 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;
@@ -478 +478 @@
 
         bool first = true;
-        for (i = 0; i < vol->dev_no; i++) {
+        for (i = 0; i < vol->extent_no; i++) {
                 if (i == p_extent)
                         continue;
@@ -542 +542 @@
         uint64_t strip_size = vol->strip_size / vol->bsize; /* in blocks */
         uint64_t stripe = (ba / strip_size); /* stripe number */
-        uint64_t p_extent = (stripe / (vol->dev_no - 1)) % vol->dev_no; /* parity extent */
+        uint64_t p_extent = (stripe / (vol->extent_no - 1)) % vol->extent_no; /* parity extent */
         uint64_t extent;
-        if ((stripe % (vol->dev_no - 1)) < p_extent)
-                extent = (stripe % (vol->dev_no - 1));
+        if ((stripe % (vol->extent_no - 1)) < p_extent)
+                extent = (stripe % (vol->extent_no - 1));
         else
-                extent = ((stripe % (vol->dev_no - 1)) + 1);
-        uint64_t ext_stripe = stripe / (vol->dev_no - 1); /* stripe level */
+                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 */
 
@@ -625 +625 @@
                 left -= cnt;
                 strip_off = 0;
-                if (extent + 1 >= vol->dev_no ||
-                    (extent + 1 == p_extent && p_extent + 1 >= vol->dev_no))
+                if (extent + 1 >= vol->extent_no ||
+                    (extent + 1 == p_extent && p_extent + 1 >= vol->extent_no))
                         ext_stripe++;
                 stripe++;
-                p_extent = (stripe / (vol->dev_no - 1)) % vol->dev_no; /* parity extent */
-                if ((stripe % (vol->dev_no - 1)) < p_extent)
-                        extent = (stripe % (vol->dev_no - 1));
+                p_extent = (stripe / (vol->extent_no - 1)) % vol->extent_no; /* parity extent */
+                if ((stripe % (vol->extent_no - 1)) < p_extent)
+                        extent = (stripe % (vol->extent_no - 1));
                 else
-                        extent = ((stripe % (vol->dev_no - 1)) + 1);
+                        extent = ((stripe % (vol->extent_no - 1)) + 1);
         }
 
@@ -659 +659 @@
         }
 
-        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;
@@ -667 +667 @@
         }
 
-        if (bad == vol->dev_no) {
+        if (bad == vol->extent_no) {
                 HR_WARN("hr_raid5_rebuild(): no bad extent on \"%s\", "
                     "aborting rebuild\n", vol->devname);
@@ -703 +703 @@
 
         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);
@@ -718 +718 @@
                  */
                 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;