diff --git a/src/core/execute.c b/src/core/execute.c index 645b6bf3b7..993f35ebbb 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -2270,7 +2270,7 @@ static int apply_mount_namespace( _cleanup_strv_free_ char **rw = NULL, **empty_directories = NULL; char *tmp = NULL, *var = NULL; const char *root_dir = NULL, *root_image = NULL; - NameSpaceInfo ns_info = { + NamespaceInfo ns_info = { .ignore_protect_paths = false, .private_dev = context->private_devices, .protect_control_groups = context->protect_control_groups, diff --git a/src/core/namespace.c b/src/core/namespace.c index df32d666bf..ac5fde16f4 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -898,7 +898,7 @@ static int make_read_only(MountEntry *m, char **blacklist, FILE *proc_self_mount return r; } -static bool namespace_info_mount_apivfs(const char *root_directory, const NameSpaceInfo *ns_info) { +static bool namespace_info_mount_apivfs(const char *root_directory, const NamespaceInfo *ns_info) { assert(ns_info); /* @@ -916,7 +916,7 @@ static bool namespace_info_mount_apivfs(const char *root_directory, const NameSp static unsigned namespace_calculate_mounts( const char* root_directory, - const NameSpaceInfo *ns_info, + const NamespaceInfo *ns_info, char** read_write_paths, char** read_only_paths, char** inaccessible_paths, @@ -960,7 +960,7 @@ static unsigned namespace_calculate_mounts( int setup_namespace( const char* root_directory, const char* root_image, - const NameSpaceInfo *ns_info, + const NamespaceInfo *ns_info, char** read_write_paths, char** read_only_paths, char** inaccessible_paths, diff --git a/src/core/namespace.h b/src/core/namespace.h index b244c8f337..665ac96d0c 100644 --- a/src/core/namespace.h +++ b/src/core/namespace.h @@ -20,7 +20,7 @@ along with systemd; If not, see . ***/ -typedef struct NameSpaceInfo NameSpaceInfo; +typedef struct NamespaceInfo NamespaceInfo; typedef struct BindMount BindMount; #include @@ -57,7 +57,7 @@ typedef enum ProtectSystem { _PROTECT_SYSTEM_INVALID = -1 } ProtectSystem; -struct NameSpaceInfo { +struct NamespaceInfo { bool ignore_protect_paths:1; bool private_dev:1; bool protect_control_groups:1; @@ -77,7 +77,7 @@ struct BindMount { int setup_namespace( const char *root_directory, const char *root_image, - const NameSpaceInfo *ns_info, + const NamespaceInfo *ns_info, char **read_write_paths, char **read_only_paths, char **inaccessible_paths, diff --git a/src/test/test-ns.c b/src/test/test-ns.c index b142c3a115..5b2a03ff6d 100644 --- a/src/test/test-ns.c +++ b/src/test/test-ns.c @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { NULL }; - static const NameSpaceInfo ns_info = { + static const NamespaceInfo ns_info = { .private_dev = true, .protect_control_groups = true, .protect_kernel_tunables = true,