mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-30 21:50:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3985 from brauner/2021-09-30.fixes.2

Browse Source 
tree-wide: cast to core scheduling cookie to llu
This commit is contained in:
Stéphane Graber
2021-09-30 17:17:07 -04:00
committed by GitHub
parent 187560436a 2e9aa14628
commit 15e9cc882f
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lxc/attach.c
View File

@@ -414,7 +414,7 @@ static int get_attach_context(struct attach_context *ctx,
INFO("Container does not run in a separate core scheduling domain"); INFO("Container does not run in a separate core scheduling domain");
else else
INFO("Container runs in separate core scheduling domain %llu", INFO("Container runs in separate core scheduling domain %llu",
(long long unsigned int)ctx->core_sched_cookie); (llu)ctx->core_sched_cookie);
ret = strnprintf(path, sizeof(path), "/proc/%d", ctx->init_pid); ret = strnprintf(path, sizeof(path), "/proc/%d", ctx->init_pid);
if (ret < 0) if (ret < 0)
@@ -1158,13 +1158,13 @@ __noreturn static void do_attach(struct attach_payload *ap)
if (!core_scheduling_cookie_valid(core_sched_cookie) && if (!core_scheduling_cookie_valid(core_sched_cookie) &&
ctx->core_sched_cookie != core_sched_cookie) { ctx->core_sched_cookie != core_sched_cookie) {
SYSERROR("Invalid core scheduling domain cookie %llu != %llu", SYSERROR("Invalid core scheduling domain cookie %llu != %llu",
(long long unsigned int)core_sched_cookie, (llu)core_sched_cookie,
(long long unsigned int)ctx->core_sched_cookie); (llu)ctx->core_sched_cookie);
goto on_error; goto on_error;
} }
INFO("Joined core scheduling domain of %d with cookie %lld", INFO("Joined core scheduling domain of %d with cookie %lld",
ctx->init_pid, core_sched_cookie); ctx->init_pid, (llu)core_sched_cookie);
} }
/* A description of the purpose of this functionality is provided in the /* A description of the purpose of this functionality is provided in the

2
src/lxc/macro.h
View File

@@ -763,4 +763,6 @@ static inline bool has_exact_flags(__u32 flags, __u32 mask)
"pointer type mismatch in container_of()"); \ "pointer type mismatch in container_of()"); \
((type *)(__mptr - offsetof(type, member))); }) ((type *)(__mptr - offsetof(type, member))); })
typedef long long unsigned int llu;
#endif /* __LXC_MACRO_H */ #endif /* __LXC_MACRO_H */

2
src/lxc/start.c
View File

@@ -1577,7 +1577,7 @@ static int core_scheduling(struct lxc_handler *handler)
return syserror("Failed to retrieve core scheduling domain cookie"); return syserror("Failed to retrieve core scheduling domain cookie");
TRACE("Created new core scheduling domain with cookie %llu", TRACE("Created new core scheduling domain with cookie %llu",
(long long unsigned int)conf->sched_core_cookie); (llu)conf->sched_core_cookie);
return 0; return 0;
} }