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

uspace/srv/bd/hr/raid1.c

@@ -87 +87 @@
         assert(new_volume->level == HR_LVL_1);
 
-        if (new_volume->dev_no < 2) {
+        if (new_volume->extent_no < 2) {
                 HR_ERROR("RAID 1 array needs at least 2 devices\n");
                 return EINVAL;
@@ -117 +117 @@
                 return rc;
 
-        vol->nblocks = total_blkno / vol->dev_no;
+        vol->nblocks = total_blkno / vol->extent_no;
         vol->bsize = bsize;
         vol->data_offset = HR_DATA_OFF;
@@ -239 +239 @@
                 }
                 return EINVAL;
-        } else if (healthy < vol->dev_no) {
+        } else if (healthy < vol->extent_no) {
                 if (old_state != HR_VOL_DEGRADED &&
                     old_state != HR_VOL_REBUILD) {
@@ -305 +305 @@
         switch (type) {
         case HR_BD_SYNC:
-                for (i = 0; i < vol->dev_no; i++) {
+                for (i = 0; i < vol->extent_no; i++) {
                         if (vol->extents[i].status != HR_EXT_ONLINE)
                                 continue;
@@ -316 +316 @@
                 break;
         case HR_BD_READ:
-                for (i = 0; i < vol->dev_no; i++) {
+                for (i = 0; i < vol->extent_no; i++) {
                         if (vol->extents[i].status != HR_EXT_ONLINE)
                                 continue;
@@ -330 +330 @@
                 break;
         case HR_BD_WRITE:
-                for (i = 0; i < vol->dev_no; i++) {
+                for (i = 0; i < vol->extent_no; i++) {
                         if (vol->extents[i].status != HR_EXT_ONLINE ||
                             (vol->extents[i].status == HR_EXT_REBUILD &&
@@ -385 +385 @@
         }
 
-        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;
@@ -393 +393 @@
         }
 
-        if (bad == vol->dev_no) {
+        if (bad == vol->extent_no) {
                 HR_WARN("hr_raid1_rebuild(): no bad extent on \"%s\", "
                     "aborting rebuild\n", vol->devname);
@@ -441 +441 @@
                 vol->rebuild_blk = ba;
                 cnt = min(max_blks, left);
-                for (size_t i = 0; i < vol->dev_no; i++) {
+                for (size_t i = 0; i < vol->extent_no; i++) {
                         ext = &vol->extents[i];
                         if (ext->status == HR_EXT_ONLINE) {
@@ -448 +448 @@
                                 if (rc != EOK) {
                                         hr_raid1_handle_extent_error(vol, i, rc);
-                                        if (i + 1 < vol->dev_no) {
+                                        if (i + 1 < vol->extent_no) {
                                                 /* still might have one ONLINE */
                                                 continue;