Commit 900de4ac authored by Colin Ian King's avatar Colin Ian King Committed by Alexei Starovoitov

libbpf: fix spelling mistake "conflictling" -> "conflicting"

There are several spelling mistakes in pr_warning messages. Fix these.
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 7ae9f281
...@@ -1169,7 +1169,7 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj, ...@@ -1169,7 +1169,7 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj,
pr_debug("map '%s': found key_size = %u.\n", pr_debug("map '%s': found key_size = %u.\n",
map_name, sz); map_name, sz);
if (map->def.key_size && map->def.key_size != sz) { if (map->def.key_size && map->def.key_size != sz) {
pr_warning("map '%s': conflictling key size %u != %u.\n", pr_warning("map '%s': conflicting key size %u != %u.\n",
map_name, map->def.key_size, sz); map_name, map->def.key_size, sz);
return -EINVAL; return -EINVAL;
} }
...@@ -1197,7 +1197,7 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj, ...@@ -1197,7 +1197,7 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj,
pr_debug("map '%s': found key [%u], sz = %lld.\n", pr_debug("map '%s': found key [%u], sz = %lld.\n",
map_name, t->type, sz); map_name, t->type, sz);
if (map->def.key_size && map->def.key_size != sz) { if (map->def.key_size && map->def.key_size != sz) {
pr_warning("map '%s': conflictling key size %u != %lld.\n", pr_warning("map '%s': conflicting key size %u != %lld.\n",
map_name, map->def.key_size, sz); map_name, map->def.key_size, sz);
return -EINVAL; return -EINVAL;
} }
...@@ -1212,7 +1212,7 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj, ...@@ -1212,7 +1212,7 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj,
pr_debug("map '%s': found value_size = %u.\n", pr_debug("map '%s': found value_size = %u.\n",
map_name, sz); map_name, sz);
if (map->def.value_size && map->def.value_size != sz) { if (map->def.value_size && map->def.value_size != sz) {
pr_warning("map '%s': conflictling value size %u != %u.\n", pr_warning("map '%s': conflicting value size %u != %u.\n",
map_name, map->def.value_size, sz); map_name, map->def.value_size, sz);
return -EINVAL; return -EINVAL;
} }
...@@ -1240,7 +1240,7 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj, ...@@ -1240,7 +1240,7 @@ static int bpf_object__init_user_btf_map(struct bpf_object *obj,
pr_debug("map '%s': found value [%u], sz = %lld.\n", pr_debug("map '%s': found value [%u], sz = %lld.\n",
map_name, t->type, sz); map_name, t->type, sz);
if (map->def.value_size && map->def.value_size != sz) { if (map->def.value_size && map->def.value_size != sz) {
pr_warning("map '%s': conflictling value size %u != %lld.\n", pr_warning("map '%s': conflicting value size %u != %lld.\n",
map_name, map->def.value_size, sz); map_name, map->def.value_size, sz);
return -EINVAL; return -EINVAL;
} }
......
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