TrueCloudLab/restic
16
0
Fork 3
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backend/local: Ignore ENOTTY for fsync on Mac

Browse source 
Fixes #4016.
This commit is contained in:
greatroar 2022-11-11 14:53:42 +01:00 • committed by Michael Eischer
parent 59a90943bb
commit 348e966daa
4 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/backend/local/local_unix.go
View file

@ -6,6 +6,7 @@ package local
import (
"errors"
"os"
"runtime"
"syscall"
"github.com/restic/restic/internal/fs"
@ -19,7 +20,9 @@ func fsyncDir(dir string) error {
}
err = d.Sync()
if errors.Is(err, syscall.ENOTSUP) || errors.Is(err, syscall.ENOENT) || errors.Is(err, syscall.EINVAL) {
if err != nil &&
(errors.Is(err, syscall.ENOTSUP) || errors.Is(err, syscall.ENOENT) ||
errors.Is(err, syscall.EINVAL) || isMacENOTTY(err)) {
err = nil
}
@ -31,6 +34,15 @@ func fsyncDir(dir string) error {
return err
}
// The ExFAT driver on some versions of macOS can return ENOTTY,
// "inappropriate ioctl for device", for fsync.
//
// https://github.com/restic/restic/issues/4016
// https://github.com/realm/realm-core/issues/5789
func isMacENOTTY(err error) bool {
return runtime.GOOS == "darwin" && errors.Is(err, syscall.ENOTTY)
}
// set file to readonly
func setFileReadonly(f string, mode os.FileMode) error {
return fs.Chmod(f, mode&^0222)