core: ensure all types from execute.h start with Exec
Until very recently all types defined by execute.h started with "Exec" in the name. I think that was useful, since it made clear that the types are associated with the ExecContext infrastructure. Let's hence restore this. (If we every move these types out of execute.h we should drop the "Exec" prefix again. But today is not that day.) No real code changes, just dumb renaming.
This commit is contained in:
committed by
Luca Boccassi
parent
e596867ed6
commit
37c272228d
@@ -2762,7 +2762,7 @@ static int create_many_symlinks(const char *root, const char *source, char **sym
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int set_exec_storage_quota(int fd, uint32_t proj_id, const QuotaLimit *ql) {
|
||||
static int set_exec_storage_quota(int fd, uint32_t proj_id, const ExecQuotaLimit *ql) {
|
||||
int r;
|
||||
uint64_t block_limit = 0, inode_limit = 0;
|
||||
|
||||
@@ -2852,7 +2852,7 @@ static int apply_exec_quotas(
|
||||
const char *target_dir,
|
||||
const char *cgroup_path,
|
||||
ExecDirectoryType type,
|
||||
const QuotaLimit *ql,
|
||||
const ExecQuotaLimit *ql,
|
||||
uint32_t *exec_dt_proj_id, /* in/out */
|
||||
bool *already_enforced) { /* in/out */
|
||||
|
||||
@@ -4872,23 +4872,23 @@ static int setup_delegated_namespaces(
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int set_memory_thp(MemoryTHP thp) {
|
||||
static int set_memory_thp(ExecMemoryTHP thp) {
|
||||
int r;
|
||||
|
||||
switch (thp) {
|
||||
|
||||
case MEMORY_THP_INHERIT:
|
||||
case EXEC_MEMORY_THP_INHERIT:
|
||||
return 0;
|
||||
|
||||
case MEMORY_THP_DISABLE:
|
||||
case EXEC_MEMORY_THP_DISABLE:
|
||||
r = RET_NERRNO(prctl(PR_SET_THP_DISABLE, 1, 0, 0, 0));
|
||||
break;
|
||||
|
||||
case MEMORY_THP_MADVISE:
|
||||
case EXEC_MEMORY_THP_MADVISE:
|
||||
r = RET_NERRNO(prctl(PR_SET_THP_DISABLE, 1, PR_THP_DISABLE_EXCEPT_ADVISED, 0, 0));
|
||||
break;
|
||||
|
||||
case MEMORY_THP_SYSTEM:
|
||||
case EXEC_MEMORY_THP_SYSTEM:
|
||||
r = RET_NERRNO(prctl(PR_SET_THP_DISABLE, 0, 0, 0, 0));
|
||||
break;
|
||||
|
||||
@@ -5711,11 +5711,11 @@ int exec_invoke(
|
||||
r = set_memory_thp(context->memory_thp);
|
||||
if (r == -EOPNOTSUPP)
|
||||
log_debug_errno(r, "Setting MemoryTHP=%s is not supported, ignoring.",
|
||||
memory_thp_to_string(context->memory_thp));
|
||||
exec_memory_thp_to_string(context->memory_thp));
|
||||
else if (r < 0) {
|
||||
*exit_status = EXIT_MEMORY_THP;
|
||||
return log_error_errno(r, "Failed to set MemoryTHP=%s: %m",
|
||||
memory_thp_to_string(context->memory_thp));
|
||||
exec_memory_thp_to_string(context->memory_thp));
|
||||
}
|
||||
|
||||
#if ENABLE_UTMP
|
||||
|
||||
Reference in New Issue
Block a user