From dcf6d1c2e135168f5b495af6325e9f11e75ef9e8 Mon Sep 17 00:00:00 2001 From: Jarek Kowalski Date: Wed, 14 Sep 2022 09:48:02 -0700 Subject: [PATCH] feat(general): always try O_TMPFILE on Linux when creating temporary files (#2407) --- internal/tempfile/tempfile_linux.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/internal/tempfile/tempfile_linux.go b/internal/tempfile/tempfile_linux.go index 219b3e02a..5481b1274 100644 --- a/internal/tempfile/tempfile_linux.go +++ b/internal/tempfile/tempfile_linux.go @@ -3,34 +3,21 @@ package tempfile import ( "errors" "os" - "sync/atomic" "syscall" "golang.org/x/sys/unix" ) -var unsupportedTmpFile = new(int32) //nolint:gochecknoglobals - // Create creates a temporary file that will be automatically deleted on close. func Create(dir string) (*os.File, error) { - if atomic.LoadInt32(unsupportedTmpFile) == 1 { - // already tried O_TMPFILE, was unsupported, fall back to generic - // Unix method. - return createUnixFallback(dir) - } - // on reasonably modern Linux (3.11 and above) O_TMPFILE is supported, // which creates invisible, unlinked file in a given directory. - fd, err := unix.Open(dir, unix.O_RDWR|unix.O_TMPFILE|unix.O_CLOEXEC, permissions) if err == nil { return os.NewFile(uintptr(fd), ""), nil } if errors.Is(err, syscall.EISDIR) || errors.Is(err, syscall.EOPNOTSUPP) { - // O_TMPFILE is unsupported, fall back and prevent future attempts. - atomic.StoreInt32(unsupportedTmpFile, 1) - return createUnixFallback(dir) }