Changeset f7169a6 in mainline

Timestamp:

2025-07-08T00:29:28Z (6 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

ba65caf5

Parents:

9323bb8

Message:

hr: raid5.c, parity_stripe.c: rename exec fcns

Location:

uspace/srv/bd/hr

Files:

• parity_stripe.c (modified) (8 diffs)
• parity_stripe.h (modified) (1 diff)
• raid5.c (modified) (4 diffs)

uspace/srv/bd/hr/parity_stripe.c

@@ -43 +43 @@
 #include "var.h"
 
-static void execute_stripe_degraded_mixed(hr_stripe_t *, size_t);
-static void execute_stripe_degraded(hr_stripe_t *, size_t);
-static void execute_stripe_optimal_reconstruct(hr_stripe_t *);
-static void execute_stripe_optimal_subtract(hr_stripe_t *);
-static void execute_write_stripe(hr_stripe_t *, size_t);
-static void execute_read_stripe(hr_stripe_t *, size_t);
-static void execute_stripe_degraded_good(hr_stripe_t *, size_t);
+static void hr_execute_write_stripe_degraded_mixed(hr_stripe_t *, size_t);
+static void hr_execute_write_stripe_degraded(hr_stripe_t *, size_t);
+static void hr_execute_write_stripe_optimal_reconstruct(hr_stripe_t *);
+static void hr_execute_write_stripe_optimal_subtract(hr_stripe_t *);
+static void hr_execute_write_stripe(hr_stripe_t *, size_t);
+static void hr_execute_read_stripe(hr_stripe_t *, size_t);
+static void hr_execute_write_stripe_degraded_good(hr_stripe_t *, size_t);
 static bool hr_stripe_range_non_extension(const range_t *, const range_t *,
     range_t *);
@@ -130 +130 @@
 }
 
-void execute_stripe(hr_stripe_t *stripe, size_t bad_extent)
+void hr_execute_stripe(hr_stripe_t *stripe, size_t bad_extent)
 {
         if (stripe->write)
-                execute_write_stripe(stripe, bad_extent);
+                hr_execute_write_stripe(stripe, bad_extent);
         else
-                execute_read_stripe(stripe, bad_extent);
-}
-
-void wait_for_stripe(hr_stripe_t *stripe)
+                hr_execute_read_stripe(stripe, bad_extent);
+}
+
+void hr_wait_for_stripe(hr_stripe_t *stripe)
 {
         stripe->rc = hr_fgroup_wait(stripe->worker_group, NULL, NULL);
@@ -147 +147 @@
 }
 
-static void execute_stripe_degraded_good(hr_stripe_t *stripe, size_t bad_extent)
+static void hr_execute_write_stripe_degraded_good(hr_stripe_t *stripe,
+    size_t bad_extent)
 {
         hr_volume_t *vol = stripe->vol;
@@ -212 +213 @@
 }
 
-static void execute_stripe_degraded_mixed(hr_stripe_t *stripe, size_t bad_extent)
+static void hr_execute_write_stripe_degraded_mixed(hr_stripe_t *stripe,
+    size_t bad_extent)
 {
         hr_volume_t *vol = stripe->vol;
@@ -383 +385 @@
 }
 
-static void execute_stripe_degraded(hr_stripe_t *stripe, size_t bad_extent)
+static void hr_execute_write_stripe_degraded(hr_stripe_t *stripe,
+    size_t bad_extent)
 {
         hr_volume_t *vol = stripe->vol;
@@ -420 +423 @@
 
         if (stripe->extent_span[bad_extent].cnt > 0)
-                execute_stripe_degraded_mixed(stripe, bad_extent);
+                hr_execute_write_stripe_degraded_mixed(stripe, bad_extent);
         else
-                execute_stripe_degraded_good(stripe, bad_extent);
-}
-
-static void execute_stripe_optimal_reconstruct(hr_stripe_t *stripe)
+                hr_execute_write_stripe_degraded_good(stripe, bad_extent);
+}
+
+static void hr_execute_write_stripe_optimal_reconstruct(hr_stripe_t *stripe)
 {
         hr_volume_t *vol = stripe->vol;
@@ -543 +546 @@
 }
 
-static void execute_stripe_optimal_subtract(hr_stripe_t *stripe)
+static void hr_execute_write_stripe_optimal_subtract(hr_stripe_t *stripe)
 {
         hr_volume_t *vol = stripe->vol;
@@ -616 +619 @@
 }
 
-static void execute_write_stripe(hr_stripe_t *stripe, size_t bad_extent)
+static void hr_execute_write_stripe(hr_stripe_t *stripe, size_t bad_extent)
 {
         hr_volume_t *vol = stripe->vol;
 
         if (bad_extent < vol->extent_no) {
-                execute_stripe_degraded(stripe, bad_extent);
+                hr_execute_write_stripe_degraded(stripe, bad_extent);
                 return;
         }
 
         if (stripe->subtract)
-                execute_stripe_optimal_subtract(stripe);
+                hr_execute_write_stripe_optimal_subtract(stripe);
         else
-                execute_stripe_optimal_reconstruct(stripe);
-}
-
-static void execute_read_stripe(hr_stripe_t *stripe, size_t bad_extent)
+                hr_execute_write_stripe_optimal_reconstruct(stripe);
+}
+
+static void hr_execute_read_stripe(hr_stripe_t *stripe, size_t bad_extent)
 {
         hr_volume_t *vol = stripe->vol;

uspace/srv/bd/hr/parity_stripe.h

@@ -112 +112 @@
 extern void hr_stripe_wait_for_parity_commits(hr_stripe_t *);
 extern void hr_stripe_parity_abort(hr_stripe_t *);
-extern void execute_stripe(hr_stripe_t *, size_t);
-extern void wait_for_stripe(hr_stripe_t *);
+extern void hr_execute_stripe(hr_stripe_t *, size_t);
+extern void hr_wait_for_stripe(hr_stripe_t *);
 
 #endif

uspace/srv/bd/hr/raid5.c

@@ -323 +323 @@
                 if (stripes[s].done)
                         continue;
-                execute_stripe(&stripes[s], bad_extent);
+                hr_execute_stripe(&stripes[s], bad_extent);
         }
 
@@ -329 +329 @@
                 if (stripes[s].done)
                         continue;
-                wait_for_stripe(&stripes[s]);
+                hr_wait_for_stripe(&stripes[s]);
         }
 
@@ -532 +532 @@
                 if (stripes[s].done)
                         continue;
-                execute_stripe(&stripes[s], bad_extent);
+                hr_execute_stripe(&stripes[s], bad_extent);
         }
 
@@ -538 +538 @@
                 if (stripes[s].done)
                         continue;
-                wait_for_stripe(&stripes[s]);
+                hr_wait_for_stripe(&stripes[s]);
         }