summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-01-08 01:27:13 +0100
committerLennart Poettering <lennart@poettering.net>2015-01-08 01:27:13 +0100
commitd61b600dde1f267a408440011aa980e0ed44bea6 (patch)
tree2b0d6f71fd19144df3d718fc251a78ab0a4c1897 /src
parentdfd1520d3ab98cfa376f2d84ed1e7887d013720d (diff)
util: make it easy to initialize the crtime from the current time in fd_setcrtime()
Diffstat (limited to 'src')
-rw-r--r--src/journal/journal-file.c2
-rw-r--r--src/shared/util.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index c20af5d9bf..c1b54046f9 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2623,7 +2623,7 @@ int journal_file_open(
* attributes are not supported we'll just skip this,
* and rely solely on mtime/atime/ctime of the file. */
- fd_setcrtime(f->fd, now(CLOCK_REALTIME));
+ fd_setcrtime(f->fd, 0);
#ifdef HAVE_GCRYPT
/* Try to load the FSPRG state, and if we can't, then
diff --git a/src/shared/util.c b/src/shared/util.c
index 88fd78ec8d..7d753e448a 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -7670,6 +7670,9 @@ int fd_setcrtime(int fd, usec_t usec) {
assert(fd >= 0);
+ if (usec <= 0)
+ usec = now(CLOCK_REALTIME);
+
le = htole64((uint64_t) usec);
if (fsetxattr(fd, "user.crtime_usec", &le, sizeof(le), 0) < 0)
return -errno;