diff options
author | Alban Crequy <alban@endocode.com> | 2015-03-10 18:15:52 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-03-10 18:23:46 +0100 |
commit | f85ef957e647c5182acf5e64298f68e4b7fbfe8f (patch) | |
tree | 505151f058adc41e72d262d044cc2b0092a148aa /src/shared/machine-pool.c | |
parent | 27cc6f166bdebc0e698fb692993b801db2618866 (diff) |
util: add rename_noreplace
renameat2() exists since Linux 3.15 but btrfs support for the flag
RENAME_NOREPLACE was added later.
This patch implements a fallback when renameat2() returns EINVAL.
EINVAL is the error returned when the filesystem does not support one of
the flags.
Diffstat (limited to 'src/shared/machine-pool.c')
-rw-r--r-- | src/shared/machine-pool.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c index e7671a3c5e..0fae623944 100644 --- a/src/shared/machine-pool.c +++ b/src/shared/machine-pool.c @@ -140,8 +140,9 @@ static int setup_machine_raw(uint64_t size, sd_bus_error *error) { goto fail; } - if (renameat2(AT_FDCWD, tmp, AT_FDCWD, "/var/lib/machines.raw", RENAME_NOREPLACE) < 0) { - r = sd_bus_error_set_errnof(error, errno, "Failed to move /var/lib/machines.raw into place: %m"); + r = rename_noreplace(AT_FDCWD, tmp, AT_FDCWD, "/var/lib/machines.raw"); + if (r < 0) { + sd_bus_error_set_errnof(error, r, "Failed to move /var/lib/machines.raw into place: %m"); goto fail; } |