From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 6 Jul 2025 01:43:18 +0000 (+0900)
Subject: core: rename ExecContext.ioprio_set -> .ioprio_is_set
X-Git-Tag: v258-rc1~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2643cb1aded790a83959c6bdbe42b5d4c51bdea6;p=thirdparty%2Fsystemd.git

core: rename ExecContext.ioprio_set -> .ioprio_is_set

To make it not conflict with syscall ioprio_set().
This is important as we have
```
 #define ioprio_set missing_ioprio_set
```
in missing_syscall.h.
---

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 3719984caf0..1a08c8867ed 100644
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -3028,7 +3028,7 @@ int bus_exec_context_set_transient_property(
                                 return r;
 
                         c->ioprio = ioprio_normalize(ioprio_prio_value(q, ioprio_prio_data(c->ioprio)));
-                        c->ioprio_set = true;
+                        c->ioprio_is_set = true;
 
                         unit_write_settingf(u, flags, name, "IOSchedulingClass=%s", s);
                 }
@@ -3047,7 +3047,7 @@ int bus_exec_context_set_transient_property(
 
                 if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
                         c->ioprio = ioprio_normalize(ioprio_prio_value(ioprio_prio_class(c->ioprio), p));
-                        c->ioprio_set = true;
+                        c->ioprio_is_set = true;
 
                         unit_write_settingf(u, flags, name, "IOSchedulingPriority=%i", p);
                 }
diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
index a73f87279fb..deb88e7f6b6 100644
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@ -5137,7 +5137,7 @@ int exec_invoke(
                 }
         }
 
-        if (context->ioprio_set)
+        if (context->ioprio_is_set)
                 if (ioprio_set(IOPRIO_WHO_PROCESS, 0, context->ioprio) < 0) {
                         *exit_status = EXIT_IOPRIO;
                         return log_error_errno(errno, "Failed to set up IO scheduling priority: %m");
diff --git a/src/core/execute-serialize.c b/src/core/execute-serialize.c
index c425003b0bc..9110d3447f8 100644
--- a/src/core/execute-serialize.c
+++ b/src/core/execute-serialize.c
@@ -1891,7 +1891,7 @@ static int exec_context_serialize(const ExecContext *c, FILE *f) {
                         return r;
         }
 
-        if (c->ioprio_set) {
+        if (c->ioprio_is_set) {
                 r = serialize_item_format(f, "exec-context-ioprio", "%d", c->ioprio);
                 if (r < 0)
                         return r;
@@ -2856,7 +2856,7 @@ static int exec_context_deserialize(ExecContext *c, FILE *f) {
                         r = safe_atoi(val, &c->ioprio);
                         if (r < 0)
                                 return r;
-                        c->ioprio_set = true;
+                        c->ioprio_is_set = true;
                 } else if ((val = startswith(l, "exec-context-cpu-scheduling-policy="))) {
                         c->cpu_sched_policy = sched_policy_from_string(val);
                         if (c->cpu_sched_policy < 0)
diff --git a/src/core/execute.c b/src/core/execute.c
index 14fed1f504d..28075441a46 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -1245,7 +1245,7 @@ void exec_context_dump(const ExecContext *c, FILE* f, const char *prefix) {
                                 prefix, rlimit_to_string(i), c->rlimit[i]->rlim_cur);
                 }
 
-        if (c->ioprio_set) {
+        if (c->ioprio_is_set) {
                 _cleanup_free_ char *class_str = NULL;
 
                 r = ioprio_class_to_string_alloc(ioprio_prio_class(c->ioprio), &class_str);
@@ -1607,7 +1607,7 @@ int exec_context_get_effective_ioprio(const ExecContext *c) {
 
         assert(c);
 
-        if (c->ioprio_set)
+        if (c->ioprio_is_set)
                 return c->ioprio;
 
         p = ioprio_get(IOPRIO_WHO_PROCESS, 0);
diff --git a/src/core/execute.h b/src/core/execute.h
index e8f4b3eea0e..a06f2f2eb38 100644
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -190,7 +190,7 @@ typedef struct ExecContext {
         bool oom_score_adjust_set:1;
         bool coredump_filter_set:1;
         bool nice_set:1;
-        bool ioprio_set:1;
+        bool ioprio_is_set:1;
         bool cpu_sched_set:1;
 
         /* This is not exposed to the user but available internally. We need it to make sure that whenever we
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index a6cb3c7e88e..3705e958846 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -1450,7 +1450,7 @@ int config_parse_exec_io_class(
         assert(rvalue);
 
         if (isempty(rvalue)) {
-                c->ioprio_set = false;
+                c->ioprio_is_set = false;
                 c->ioprio = IOPRIO_DEFAULT_CLASS_AND_PRIO;
                 return 0;
         }
@@ -1462,7 +1462,7 @@ int config_parse_exec_io_class(
         }
 
         c->ioprio = ioprio_normalize(ioprio_prio_value(x, ioprio_prio_data(c->ioprio)));
-        c->ioprio_set = true;
+        c->ioprio_is_set = true;
 
         return 0;
 }
@@ -1487,7 +1487,7 @@ int config_parse_exec_io_priority(
         assert(rvalue);
 
         if (isempty(rvalue)) {
-                c->ioprio_set = false;
+                c->ioprio_is_set = false;
                 c->ioprio = IOPRIO_DEFAULT_CLASS_AND_PRIO;
                 return 0;
         }
@@ -1499,7 +1499,7 @@ int config_parse_exec_io_priority(
         }
 
         c->ioprio = ioprio_normalize(ioprio_prio_value(ioprio_prio_class(c->ioprio), i));
-        c->ioprio_set = true;
+        c->ioprio_is_set = true;
 
         return 0;
 }