fusefrontend: implement fsync on directories

Fixes https://github.com/rfjakob/gocryptfs/issues/587
This commit is contained in:
Jakob Unterwurzacher 2021-07-29 20:39:50 +02:00
parent e83b79b4c2
commit 0ca302f12a
3 changed files with 51 additions and 1 deletions

View File

@ -427,7 +427,10 @@ func (f *File) Flush(ctx context.Context) syscall.Errno {
return fs.ToErrno(err) return fs.ToErrno(err)
} }
// Fsync FUSE call // Fsync: handles FUSE opcode FSYNC
//
// Unfortunately, as Node.Fsync is also defined and takes precedence,
// File.Fsync is never called at the moment.
func (f *File) Fsync(ctx context.Context, flags uint32) (errno syscall.Errno) { func (f *File) Fsync(ctx context.Context, flags uint32) (errno syscall.Errno) {
f.fdLock.RLock() f.fdLock.RLock()
defer f.fdLock.RUnlock() defer f.fdLock.RUnlock()

View File

@ -447,3 +447,22 @@ func (n *Node) Rename(ctx context.Context, name string, newParent fs.InodeEmbedd
} }
return 0 return 0
} }
// Fsync: handles FUSE opcodes FSYNC & FDIRSYNC
//
// Note: f is always set to nil by go-fuse
func (n *Node) Fsync(ctx context.Context, f fs.FileHandle, flags uint32) syscall.Errno {
dirfd, cName, errno := n.prepareAtSyscallMyself()
if errno != 0 {
return errno
}
defer syscall.Close(dirfd)
fd, err := syscallcompat.Openat(dirfd, cName, syscall.O_RDONLY|syscall.O_NOFOLLOW, 0)
if err != nil {
return fs.ToErrno(err)
}
defer syscall.Close(fd)
return fs.ToErrno(syscall.Fsync(fd))
}

View File

@ -11,6 +11,7 @@ import (
"runtime" "runtime"
"strings" "strings"
"sync" "sync"
"syscall"
"testing" "testing"
"github.com/rfjakob/gocryptfs/tests/test_helpers" "github.com/rfjakob/gocryptfs/tests/test_helpers"
@ -394,3 +395,30 @@ func TestMaxlen(t *testing.T) {
t.Errorf("wrong output: %s", string(out)) t.Errorf("wrong output: %s", string(out))
} }
} }
func TestFsync(t *testing.T) {
fileName := test_helpers.DefaultPlainDir + "/" + t.Name() + ".file"
fileFD, err := syscall.Creat(fileName, 0600)
if err != nil {
t.Fatal(err)
}
defer syscall.Close(fileFD)
dirName := test_helpers.DefaultPlainDir + "/" + t.Name() + ".dir"
if err := os.Mkdir(dirName, 0700); err != nil {
t.Fatal(err)
}
dirFD, err := syscall.Open(dirName, syscall.O_RDONLY, 0)
if err != nil {
t.Fatal(err)
}
defer syscall.Close(dirFD)
err = syscall.Fsync(dirFD)
if err != nil {
t.Fatal(err)
}
err = syscall.Fsync(fileFD)
if err != nil {
t.Fatal(err)
}
}