cgroups: update terminology

parent ffa68840
...@@ -2562,8 +2562,8 @@ static int device_cgroup_rule_parse(struct device_item *device, const char *key, ...@@ -2562,8 +2562,8 @@ static int device_cgroup_rule_parse(struct device_item *device, const char *key,
device->major = -1; device->major = -1;
device->minor = -1; device->minor = -1;
device->global_rule = device->allow device->global_rule = device->allow
? LXC_BPF_DEVICE_CGROUP_BLACKLIST ? LXC_BPF_DEVICE_CGROUP_DENYLIST
: LXC_BPF_DEVICE_CGROUP_WHITELIST; : LXC_BPF_DEVICE_CGROUP_ALLOWLIST;
device->allow = -1; device->allow = -1;
return 0; return 0;
} }
......
...@@ -176,7 +176,7 @@ struct bpf_program *bpf_program_new(uint32_t prog_type) ...@@ -176,7 +176,7 @@ struct bpf_program *bpf_program_new(uint32_t prog_type)
/* /*
* By default a whitelist is used unless the user tells us otherwise. * By default a whitelist is used unless the user tells us otherwise.
*/ */
prog->device_list_type = LXC_BPF_DEVICE_CGROUP_WHITELIST; prog->device_list_type = LXC_BPF_DEVICE_CGROUP_ALLOWLIST;
return move_ptr(prog); return move_ptr(prog);
} }
...@@ -298,7 +298,7 @@ int bpf_program_finalize(struct bpf_program *prog) ...@@ -298,7 +298,7 @@ int bpf_program_finalize(struct bpf_program *prog)
return ret_set_errno(-1, EINVAL); return ret_set_errno(-1, EINVAL);
TRACE("Implementing %s bpf device cgroup program", TRACE("Implementing %s bpf device cgroup program",
prog->device_list_type == LXC_BPF_DEVICE_CGROUP_BLACKLIST prog->device_list_type == LXC_BPF_DEVICE_CGROUP_DENYLIST
? "blacklist" ? "blacklist"
: "whitelist"); : "whitelist");
...@@ -450,10 +450,10 @@ int bpf_list_add_device(struct lxc_conf *conf, struct device_item *device) ...@@ -450,10 +450,10 @@ int bpf_list_add_device(struct lxc_conf *conf, struct device_item *device)
if (cur->global_rule > LXC_BPF_DEVICE_CGROUP_LOCAL_RULE && if (cur->global_rule > LXC_BPF_DEVICE_CGROUP_LOCAL_RULE &&
device->global_rule > LXC_BPF_DEVICE_CGROUP_LOCAL_RULE) { device->global_rule > LXC_BPF_DEVICE_CGROUP_LOCAL_RULE) {
TRACE("Switched from %s to %s", TRACE("Switched from %s to %s",
cur->global_rule == LXC_BPF_DEVICE_CGROUP_WHITELIST cur->global_rule == LXC_BPF_DEVICE_CGROUP_ALLOWLIST
? "whitelist" ? "whitelist"
: "blacklist", : "blacklist",
device->global_rule == LXC_BPF_DEVICE_CGROUP_WHITELIST device->global_rule == LXC_BPF_DEVICE_CGROUP_ALLOWLIST
? "whitelist" ? "whitelist"
: "blacklist"); : "blacklist");
cur->global_rule = device->global_rule; cur->global_rule = device->global_rule;
......
...@@ -215,8 +215,8 @@ struct lxc_state_client { ...@@ -215,8 +215,8 @@ struct lxc_state_client {
enum { enum {
LXC_BPF_DEVICE_CGROUP_LOCAL_RULE = -1, LXC_BPF_DEVICE_CGROUP_LOCAL_RULE = -1,
LXC_BPF_DEVICE_CGROUP_WHITELIST = 0, LXC_BPF_DEVICE_CGROUP_ALLOWLIST = 0,
LXC_BPF_DEVICE_CGROUP_BLACKLIST = 1, LXC_BPF_DEVICE_CGROUP_DENYLIST = 1,
}; };
struct device_item { struct device_item {
...@@ -227,8 +227,8 @@ struct device_item { ...@@ -227,8 +227,8 @@ struct device_item {
int allow; int allow;
/* /*
* LXC_BPF_DEVICE_CGROUP_LOCAL_RULE -> no global rule * LXC_BPF_DEVICE_CGROUP_LOCAL_RULE -> no global rule
* LXC_BPF_DEVICE_CGROUP_WHITELIST -> whitelist (deny all) * LXC_BPF_DEVICE_CGROUP_ALLOWLIST -> allowlist (deny all)
* LXC_BPF_DEVICE_CGROUP_BLACKLIST -> blacklist (allow all) * LXC_BPF_DEVICE_CGROUP_DENYLIST -> denylist (allow all)
*/ */
int global_rule; int global_rule;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment