diff options
Diffstat (limited to 'internal/fusefrontend')
| -rw-r--r-- | internal/fusefrontend/file.go | 2 | ||||
| -rw-r--r-- | internal/fusefrontend/node_dir_ops.go | 2 | ||||
| -rw-r--r-- | internal/fusefrontend/root_node.go | 4 | 
3 files changed, 5 insertions, 3 deletions
| diff --git a/internal/fusefrontend/file.go b/internal/fusefrontend/file.go index 66b3e24..0367705 100644 --- a/internal/fusefrontend/file.go +++ b/internal/fusefrontend/file.go @@ -409,7 +409,7 @@ func (f *File) Flush(ctx context.Context) syscall.Errno {  	if err != nil {  		return fs.ToErrno(err)  	} -	err = syscall.Close(newFd) +	err = syscallcompat.Close(newFd)  	return fs.ToErrno(err)  } diff --git a/internal/fusefrontend/node_dir_ops.go b/internal/fusefrontend/node_dir_ops.go index a93271d..b8d4ec7 100644 --- a/internal/fusefrontend/node_dir_ops.go +++ b/internal/fusefrontend/node_dir_ops.go @@ -306,7 +306,7 @@ retry:  		return fs.ToErrno(err)  	}  	if err != nil { -		tlog.Warn.Printf("Rmdir: Readdirnames: %v", err) +		tlog.Warn.Printf("Rmdir: Getdents: %v", err)  		return fs.ToErrno(err)  	}  	// MacOS sprinkles .DS_Store files everywhere. This is hard to avoid for diff --git a/internal/fusefrontend/root_node.go b/internal/fusefrontend/root_node.go index 5870c97..e03e250 100644 --- a/internal/fusefrontend/root_node.go +++ b/internal/fusefrontend/root_node.go @@ -203,6 +203,8 @@ func (rn *RootNode) openWriteOnlyFile(dirfd int, cName string, newFlags int) (rw  //  // openBackingDir is secure against symlink races by using Openat and  // ReadDirIVAt. +// +// Retries on EINTR.  func (rn *RootNode) openBackingDir(relPath string) (dirfd int, cName string, err error) {  	dirRelPath := nametransform.Dir(relPath)  	// With PlaintextNames, we don't need to read DirIVs. Easy. @@ -216,7 +218,7 @@ func (rn *RootNode) openBackingDir(relPath string) (dirfd int, cName string, err  		return dirfd, cName, nil  	}  	// Open cipherdir (following symlinks) -	dirfd, err = syscall.Open(rn.args.Cipherdir, syscall.O_DIRECTORY|syscallcompat.O_PATH, 0) +	dirfd, err = syscallcompat.Open(rn.args.Cipherdir, syscall.O_DIRECTORY|syscallcompat.O_PATH, 0)  	if err != nil {  		return -1, "", err  	} | 
