From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 26 Jul 2022 14:15:01 +0000 (+0900)
Subject: Revert "core/mount: fail early if directory cannot be created"
X-Git-Tag: v252-rc1~571^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5e6b7c225987551ebda14d2d7feadb66a64fb3c;p=thirdparty%2Fsystemd.git

Revert "core/mount: fail early if directory cannot be created"

This reverts commit e4de58c8231e47509ffeb3aa47620ca42f22d7f6.

If mkdir() fails and the path does exist, then the later mount
command fails anyway. Hence, it is not necessary to fail here.

Fixes #24120.
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 836ba132cb9..015a77221af 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1054,10 +1054,8 @@ static void mount_enter_mounting(Mount *m) {
                 r = mkdir_p_label(p->what, m->directory_mode);
                 /* mkdir_p_label() can return -EEXIST if the target path exists and is not a directory - which is
                  * totally OK, in case the user wants us to overmount a non-directory inode. */
-                if (r < 0 && r != -EEXIST) {
+                if (r < 0 && r != -EEXIST)
                         log_unit_error_errno(UNIT(m), r, "Failed to make bind mount source '%s': %m", p->what);
-                        goto fail;
-                }
         }
 
         if (p) {