summaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-02-26 21:44:48 +0100
committerLudovic Courtès <ludo@gnu.org>2020-02-26 22:05:56 +0100
commit513c0a0f4602018a49d8fd2dfa24670a3fa08ac9 (patch)
treef1f3a0ad943880314abd852c97ffae743d15eea3 /nix
parente524b57740cd6ac51613b5072b6e43b4c5aab281 (diff)
downloadpatches-513c0a0f4602018a49d8fd2dfa24670a3fa08ac9.tar
patches-513c0a0f4602018a49d8fd2dfa24670a3fa08ac9.tar.gz
daemon: Drop 'AT_STATX_DONT_SYNC' flag upon EINVAL.
Fixes <https://bugs.gnu.org/39727>. Reported by Paul Garlick <pgarlick@tourbillion-technology.com>. * nix/libstore/gc.cc (LocalStore::removeUnusedLinks) [HAVE_STATX]: Add 'statx_flags' static variables. Clear 'AT_STATX_DONT_SYNC' flag from 'statx_flags' when 'statx' returns EINVAL.
Diffstat (limited to 'nix')
-rw-r--r--nix/libstore/gc.cc20
1 files changed, 16 insertions, 4 deletions
diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc
index 77d7fa2dc7..8bc4e01eb0 100644
--- a/nix/libstore/gc.cc
+++ b/nix/libstore/gc.cc
@@ -581,15 +581,27 @@ void LocalStore::removeUnusedLinks(const GCState & state)
#ifdef HAVE_STATX
# define st_size stx_size
# define st_nlink stx_nlink
+ static int statx_flags = AT_SYMLINK_NOFOLLOW | AT_STATX_DONT_SYNC;
struct statx st;
- if (statx(AT_FDCWD, path.c_str(),
- AT_SYMLINK_NOFOLLOW | AT_STATX_DONT_SYNC,
- STATX_SIZE | STATX_NLINK, &st) == -1)
+
+ if (statx(AT_FDCWD, path.c_str(), statx_flags,
+ STATX_SIZE | STATX_NLINK, &st) == -1) {
+ if (errno == EINVAL) {
+ /* Old 3.10 kernels (CentOS 7) don't support
+ AT_STATX_DONT_SYNC, so try again without it. */
+ statx_flags &= ~AT_STATX_DONT_SYNC;
+ if (statx(AT_FDCWD, path.c_str(), statx_flags,
+ STATX_SIZE | STATX_NLINK, &st) == -1)
+ throw SysError(format("statting `%1%'") % path);
+ } else {
+ throw SysError(format("statting `%1%'") % path);
+ }
+ }
#else
struct stat st;
if (lstat(path.c_str(), &st) == -1)
-#endif
throw SysError(format("statting `%1%'") % path);
+#endif
if (st.st_nlink != 1) {
actualSize += st.st_size;