system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 18:24:38 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

repart: correct timespec_store usage too

Browse source
This commit is contained in:
Mike Yuan 2024-05-07 20:15:57 +08:00
parent 158681f0f9
commit 8aed85875d
No known key found for this signature in database
GPG key ID: 417471C0A40F58B3
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/partition/repart.c
View file

@ -4898,7 +4898,6 @@ static int do_copy_files(Context *context, Partition *p, const char *root) {
strempty(arg_copy_source), *source, strempty(root), *target);
} else {
_cleanup_free_ char *dn = NULL, *fn = NULL;
struct timespec tspec;
/* We are looking at a regular file */
@ -4933,10 +4932,13 @@ static int do_copy_files(Context *context, Partition *p, const char *root) {
(void) copy_access(sfd, tfd);
(void) copy_times(sfd, tfd, 0);
timespec_store_nsec(&tspec, ts);
if (ts != USEC_INFINITY) {
struct timespec tspec;
timespec_store(&tspec, ts);
if (ts != USEC_INFINITY && futimens(pfd, (const struct timespec[2]) { { .tv_nsec = UTIME_OMIT }, tspec }) < 0)
return -errno;
if (futimens(pfd, (const struct timespec[2]) { { .tv_nsec = UTIME_OMIT }, tspec }) < 0)
return -errno;
}
}
}