shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-25 10:04:04 +03:00
Code

core: try again bind mounting if the destination was already created

Browse Source 
If the destination mount point is on a shared filesystem and is
missing on the first attempt, we try to create it, but then
fail with -EEXIST if something else created it in the meanwhile.
Enter the retry logic on EEXIST, as we can just use the mount
point if it was already created.

Fixes https://github.com/systemd/systemd/issues/29690

(cherry picked from commit c3f0f6f8bd812fee4b2ab658a5cc9ac9167d387d)
This commit is contained in:
Luca Boccassi 2024-06-29 18:31:23 +01:00 committed by Luca Boccassi
parent 24987eb3cc
commit df990be913
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/namespace.c
View File

@ -1695,11 +1695,11 @@ static int apply_one_mount(
(void) mkdir_parents(mount_entry_path(m), 0755); (void) mkdir_parents(mount_entry_path(m), 0755);
q = make_mount_point_inode_from_path(what, mount_entry_path(m), 0755); q = make_mount_point_inode_from_path(what, mount_entry_path(m), 0755);
if (q < 0) { if (q < 0 && q != -EEXIST)
if (q != -EEXIST) // FIXME: this shouldn't be logged at LOG_WARNING, but be bubbled up, and logged there to avoid duplicate logging // FIXME: this shouldn't be logged at LOG_WARNING, but be bubbled up, and logged there to avoid duplicate logging
log_warning_errno(q, "Failed to create destination mount point node '%s', ignoring: %m", log_warning_errno(q, "Failed to create destination mount point node '%s', ignoring: %m",
mount_entry_path(m)); mount_entry_path(m));
} else else
try_again = true; try_again = true;
} }