Changeset 50bed55d in mainline for uspace/srv

Timestamp:

2024-10-18T14:30:56Z (15 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

fad91b9

Parents:

6d55e39

Message:

hr: rename levels to upper case

Location:

uspace/srv/bd/hr

Files:

• hr.c (modified) (2 diffs)
• raid0.c (modified) (2 diffs)
• raid1.c (modified) (2 diffs)
• raid4.c (modified) (2 diffs)
• raid5.c (modified) (2 diffs)
• superblock.c (modified) (1 diff)

uspace/srv/bd/hr/hr.c

@@ -147 +147 @@
 
         if (assemble) {
-                if (cfg->level != hr_l_empty)
+                if (cfg->level != HR_LVL_UNKNOWN)
                         log_msg(LOG_DEFAULT, LVL_WARN,
                             "level manually set when assembling, ingoring");
-                new_volume->level = hr_l_empty;
+                new_volume->level = HR_LVL_UNKNOWN;
         }
 
@@ -172 +172 @@
 
         switch (new_volume->level) {
-        case hr_l_1:
+        case HR_LVL_1:
                 new_volume->hr_ops.create = hr_raid1_create;
                 new_volume->hr_ops.init = hr_raid1_init;
                 break;
-        case hr_l_0:
+        case HR_LVL_0:
                 new_volume->hr_ops.create = hr_raid0_create;
                 new_volume->hr_ops.init = hr_raid0_init;
                 break;
-        case hr_l_4:
+        case HR_LVL_4:
                 new_volume->hr_ops.create = hr_raid4_create;
                 new_volume->hr_ops.init = hr_raid4_init;
                 break;
-        case hr_l_5:
+        case HR_LVL_5:
                 new_volume->hr_ops.create = hr_raid5_create;
                 new_volume->hr_ops.init = hr_raid5_init;

uspace/srv/bd/hr/raid0.c

@@ -214 +214 @@
         errno_t rc;
 
-        assert(new_volume->level == hr_l_0);
+        assert(new_volume->level == HR_LVL_0);
 
         if (new_volume->dev_no < 2) {
@@ -237 +237 @@
         uint64_t total_blkno;
 
-        assert(vol->level == hr_l_0);
+        assert(vol->level == HR_LVL_0);
 
         rc = hr_check_devs(vol, &total_blkno, &bsize);

uspace/srv/bd/hr/raid1.c

@@ -182 +182 @@
         errno_t rc;
 
-        assert(new_volume->level == hr_l_1);
+        assert(new_volume->level == HR_LVL_1);
 
         if (new_volume->dev_no < 2) {
@@ -205 +205 @@
         uint64_t total_blkno;
 
-        assert(vol->level == hr_l_1);
+        assert(vol->level == HR_LVL_1);
 
         rc = hr_check_devs(vol, &total_blkno, &bsize);

uspace/srv/bd/hr/raid4.c

@@ -264 +264 @@
         errno_t rc;
 
-        assert(new_volume->level == hr_l_4);
+        assert(new_volume->level == HR_LVL_4);
 
         if (new_volume->dev_no < 3) {
@@ -287 +287 @@
         uint64_t total_blkno;
 
-        assert(vol->level == hr_l_4);
+        assert(vol->level == HR_LVL_4);
 
         rc = hr_check_devs(vol, &total_blkno, &bsize);

uspace/srv/bd/hr/raid5.c

@@ -276 +276 @@
         errno_t rc;
 
-        assert(new_volume->level == hr_l_5);
+        assert(new_volume->level == HR_LVL_5);
 
         if (new_volume->dev_no < 3) {
@@ -299 +299 @@
         uint64_t total_blkno;
 
-        assert(vol->level == hr_l_5);
+        assert(vol->level == HR_LVL_5);
 
         rc = hr_check_devs(vol, &total_blkno, &bsize);

uspace/srv/bd/hr/superblock.c

@@ -67 +67 @@
 
         meta_blkno = (HR_META_OFF + HR_META_SIZE);
-        if (vol->level != hr_l_1)
+        if (vol->level != HR_LVL_1)
                 meta_blkno *= vol->dev_no;