diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-13 14:04:32 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-13 14:39:40 +0100 |
| commit | 7c76e1812d2c6de1e597e2fc2db288c1ac9656a3 (patch) | |
| tree | 6f0168636bf1f048527550dfeffeb6a9843b335f | |
| parent | treewide: drop "RUN_" from "RUN_WITH_UMASK" (diff) | |
| download | systemd-7c76e1812d2c6de1e597e2fc2db288c1ac9656a3.tar.xz systemd-7c76e1812d2c6de1e597e2fc2db288c1ac9656a3.zip | |
core/namespace: indentation
| -rw-r--r-- | src/core/namespace.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/namespace.c b/src/core/namespace.c index 7082cd19d8..b97617b823 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -1113,8 +1113,8 @@ static int mount_procfs(const MountEntry *m, const NamespaceInfo *ns_info) { * added in the same commit: if it's supported it is thus also per-instance. */ const char *hpv = ns_info->protect_proc == PROTECT_PROC_DEFAULT ? - "off" : - protect_proc_to_string(ns_info->protect_proc); + "off" : + protect_proc_to_string(ns_info->protect_proc); /* hidepid= support was added in 5.8, so we can use fsconfig()/fsopen() (which were added in * 5.2) to check if hidepid= is supported. This avoids a noisy dmesg log by the kernel when @@ -1256,8 +1256,8 @@ static int mount_image(const MountEntry *m, const char *root_directory) { } r = verity_dissect_and_mount( - /* src_fd= */ -1, mount_entry_source(m), mount_entry_path(m), m->image_options, - host_os_release_id, host_os_release_version_id, host_os_release_sysext_level, NULL); + /* src_fd= */ -1, mount_entry_source(m), mount_entry_path(m), m->image_options, + host_os_release_id, host_os_release_version_id, host_os_release_sysext_level, NULL); if (r == -ENOENT && m->ignore) return 0; if (r == -ESTALE && host_os_release_id) @@ -1704,7 +1704,7 @@ static size_t namespace_calculate_mounts( n_bind_mounts + n_mount_images + (n_extension_images > 0 || n_extension_directories > 0 ? /* Mount each image and directory plus an overlay per hierarchy */ - n_hierarchies + n_extension_images + n_extension_directories: 0) + + n_hierarchies + n_extension_images + n_extension_directories: 0) + n_temporary_filesystems + ns_info->private_dev + (ns_info->protect_kernel_tunables ? @@ -2780,7 +2780,7 @@ static int setup_one_tmp_dir(const char *id, const char *prefix, char **path, ch WITH_UMASK(0000) if (mkdir(y, 0777 | S_ISVTX) < 0) - return -errno; + return -errno; r = label_fix_full(AT_FDCWD, y, prefix, 0); if (r < 0) |