From: Andreas Stührk <andreas.stuehrk@yaxi.tech>
Date: Tue, 25 Feb 2025 23:05:41 +0000 (+0100)
Subject: copy: Invoke hardlink context cleanup before restoring timestamps
X-Git-Tag: v258-rc1~1257
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b66291444b8d4022ce68121af8e6f99d29ebefd0;p=thirdparty%2Fsystemd.git

copy: Invoke hardlink context cleanup before restoring timestamps

When hardlink recreation is requested, it creates temporary files that
will be deleted once the context is destroyed. The deletion
(potentially) updates the directory's timestamps, so it's crucial that
the deletion happens before the directory timestamps are restored when
`COPY_RESTORE_DIRECTORY_TIMESTAMPS` is requested.
---

diff --git a/src/shared/copy.c b/src/shared/copy.c
index 17c027a9e89..6a008f2dbe8 100644
--- a/src/shared/copy.c
+++ b/src/shared/copy.c
@@ -1178,11 +1178,16 @@ finish:
                 if (fchmod(fdt, st->st_mode & 07777) < 0)
                         r = -errno;
 
+                /* Run hardlink context cleanup now because it potentially changes timestamps */
+                hardlink_context_destroy(&our_hardlink_context);
                 (void) copy_xattr(dirfd(d), NULL, fdt, NULL, copy_flags);
                 (void) futimens(fdt, (struct timespec[]) { st->st_atim, st->st_mtim });
-        } else if (FLAGS_SET(copy_flags, COPY_RESTORE_DIRECTORY_TIMESTAMPS))
+        } else if (FLAGS_SET(copy_flags, COPY_RESTORE_DIRECTORY_TIMESTAMPS)) {
+                /* Run hardlink context cleanup now because it potentially changes timestamps */
+                hardlink_context_destroy(&our_hardlink_context);
                 /* If the directory already exists, make sure the timestamps stay the same as before. */
                 (void) futimens(fdt, (struct timespec[]) { dt_st.st_atim, dt_st.st_mtim });
+        }
 
         if (copy_flags & COPY_FSYNC_FULL) {
                 if (fsync(fdt) < 0)