aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorJakob Unterwurzacher2026-11-19 21:14:58 +0100
committerJakob Unterwurzacher2026-11-19 21:25:56 +0100
commit173e5056ef8beaa461c5a6665b75e1d97503c5ac (patch)
treebfff9a1b18a97bac7ee8b6c4f05d2d9b9fd2cc58 /internal
parent52c4864d849cbbb76d49d1a908025b77c7246bda (diff)
go.mod: upgrade to go-fuse v3 (current master 1ffd5bd2bfc64)HEADmaster
go-fuse master is now github.com/hanwen/go-fuse/v3. Changes needed: * Change the import path, also in build.bash and version.go, which look up the go-fuse module version. * fuse.Context is gone, and fuse.FromContext() now returns a fuse.Caller value. Caller has the same Owner and Pid fields, so use *fuse.Caller in place of *fuse.Context. * fuse.Status is replaced by syscall.Errno, so ReadResult.Bytes() returns an Errno now. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Diffstat (limited to 'internal')
-rw-r--r--internal/contentenc/content.go2
-rw-r--r--internal/fusefrontend/args.go2
-rw-r--r--internal/fusefrontend/file.go6
-rw-r--r--internal/fusefrontend/file_allocate_truncate.go2
-rw-r--r--internal/fusefrontend/file_api_check.go2
-rw-r--r--internal/fusefrontend/file_dir_ops.go4
-rw-r--r--internal/fusefrontend/file_holes.go2
-rw-r--r--internal/fusefrontend/file_setattr.go4
-rw-r--r--internal/fusefrontend/node.go4
-rw-r--r--internal/fusefrontend/node_api_check.go2
-rw-r--r--internal/fusefrontend/node_dir_ops.go8
-rw-r--r--internal/fusefrontend/node_helpers.go14
-rw-r--r--internal/fusefrontend/node_open_create.go4
-rw-r--r--internal/fusefrontend/node_prepare_syscall.go2
-rw-r--r--internal/fusefrontend/node_xattr.go4
-rw-r--r--internal/fusefrontend/node_xattr_darwin.go6
-rw-r--r--internal/fusefrontend/node_xattr_freebsd.go4
-rw-r--r--internal/fusefrontend/node_xattr_linux.go6
-rw-r--r--internal/fusefrontend/prepare_syscall_test.go2
-rw-r--r--internal/fusefrontend/statx_linux.go4
-rw-r--r--internal/fusefrontend/xattr_unit_test.go2
-rw-r--r--internal/fusefrontend_reverse/file.go4
-rw-r--r--internal/fusefrontend_reverse/file_api_check.go2
-rw-r--r--internal/fusefrontend_reverse/node.go4
-rw-r--r--internal/fusefrontend_reverse/node_api_check.go2
-rw-r--r--internal/fusefrontend_reverse/node_dir_ops.go4
-rw-r--r--internal/fusefrontend_reverse/node_helpers.go4
-rw-r--r--internal/fusefrontend_reverse/node_xattr_darwin.go2
-rw-r--r--internal/fusefrontend_reverse/node_xattr_linux.go2
-rw-r--r--internal/fusefrontend_reverse/root_node.go4
-rw-r--r--internal/fusefrontend_reverse/virtualconf.go4
-rw-r--r--internal/fusefrontend_reverse/virtualnode.go4
-rw-r--r--internal/syscallcompat/asuser.go10
-rw-r--r--internal/syscallcompat/asuser_darwin.go4
-rw-r--r--internal/syscallcompat/asuser_freebsd.go4
-rw-r--r--internal/syscallcompat/asuser_linux.go4
-rw-r--r--internal/syscallcompat/getdents_linux.go2
-rw-r--r--internal/syscallcompat/getdents_other.go2
-rw-r--r--internal/syscallcompat/getdents_test.go2
-rw-r--r--internal/syscallcompat/sys_darwin.go2
-rw-r--r--internal/syscallcompat/sys_freebsd.go4
-rw-r--r--internal/syscallcompat/sys_linux.go4
42 files changed, 79 insertions, 81 deletions
diff --git a/internal/contentenc/content.go b/internal/contentenc/content.go
index 5bf0b3c..3a0b4c3 100644
--- a/internal/contentenc/content.go
+++ b/internal/contentenc/content.go
@@ -10,7 +10,7 @@ import (
"runtime"
"sync"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
diff --git a/internal/fusefrontend/args.go b/internal/fusefrontend/args.go
index 84e34af..e936fd3 100644
--- a/internal/fusefrontend/args.go
+++ b/internal/fusefrontend/args.go
@@ -1,7 +1,7 @@
package fusefrontend
import (
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
)
// Args is a container for arguments that are passed from main() to fusefrontend
diff --git a/internal/fusefrontend/file.go b/internal/fusefrontend/file.go
index 8eee0f8..03eccd7 100644
--- a/internal/fusefrontend/file.go
+++ b/internal/fusefrontend/file.go
@@ -16,8 +16,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/contentenc"
"github.com/rfjakob/gocryptfs/v2/internal/inomap"
@@ -26,7 +26,7 @@ import (
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
-// File implements the go-fuse v2 API (github.com/hanwen/go-fuse/v2/fs)
+// File implements the go-fuse v2 API (github.com/hanwen/go-fuse/v3/fs)
type File struct {
fd *os.File
// Has Release() already been called on this file? This also means that the
diff --git a/internal/fusefrontend/file_allocate_truncate.go b/internal/fusefrontend/file_allocate_truncate.go
index 19b7697..14dfdd0 100644
--- a/internal/fusefrontend/file_allocate_truncate.go
+++ b/internal/fusefrontend/file_allocate_truncate.go
@@ -13,7 +13,7 @@ import (
"github.com/rfjakob/gocryptfs/v2/internal/contentenc"
- "github.com/hanwen/go-fuse/v2/fs"
+ "github.com/hanwen/go-fuse/v3/fs"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
diff --git a/internal/fusefrontend/file_api_check.go b/internal/fusefrontend/file_api_check.go
index 019e97f..0416ab1 100644
--- a/internal/fusefrontend/file_api_check.go
+++ b/internal/fusefrontend/file_api_check.go
@@ -1,7 +1,7 @@
package fusefrontend
import (
- "github.com/hanwen/go-fuse/v2/fs"
+ "github.com/hanwen/go-fuse/v3/fs"
)
// Check that we have implemented the fs.File* interfaces
diff --git a/internal/fusefrontend/file_dir_ops.go b/internal/fusefrontend/file_dir_ops.go
index 683da87..772eed5 100644
--- a/internal/fusefrontend/file_dir_ops.go
+++ b/internal/fusefrontend/file_dir_ops.go
@@ -4,8 +4,8 @@ import (
"context"
"syscall"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/configfile"
"github.com/rfjakob/gocryptfs/v2/internal/nametransform"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
diff --git a/internal/fusefrontend/file_holes.go b/internal/fusefrontend/file_holes.go
index fc58898..e63d534 100644
--- a/internal/fusefrontend/file_holes.go
+++ b/internal/fusefrontend/file_holes.go
@@ -7,7 +7,7 @@ import (
"runtime"
"syscall"
- "github.com/hanwen/go-fuse/v2/fs"
+ "github.com/hanwen/go-fuse/v3/fs"
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
diff --git a/internal/fusefrontend/file_setattr.go b/internal/fusefrontend/file_setattr.go
index fe4bc47..5afa89b 100644
--- a/internal/fusefrontend/file_setattr.go
+++ b/internal/fusefrontend/file_setattr.go
@@ -4,8 +4,8 @@ import (
"context"
"syscall"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
diff --git a/internal/fusefrontend/node.go b/internal/fusefrontend/node.go
index 4f6ae45..ec0a14e 100644
--- a/internal/fusefrontend/node.go
+++ b/internal/fusefrontend/node.go
@@ -6,8 +6,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/nametransform"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
diff --git a/internal/fusefrontend/node_api_check.go b/internal/fusefrontend/node_api_check.go
index 37d4293..e3e7fb0 100644
--- a/internal/fusefrontend/node_api_check.go
+++ b/internal/fusefrontend/node_api_check.go
@@ -1,7 +1,7 @@
package fusefrontend
import (
- "github.com/hanwen/go-fuse/v2/fs"
+ "github.com/hanwen/go-fuse/v3/fs"
)
// Check that we have implemented the fs.Node* interfaces
diff --git a/internal/fusefrontend/node_dir_ops.go b/internal/fusefrontend/node_dir_ops.go
index 97327ce..fc90c05 100644
--- a/internal/fusefrontend/node_dir_ops.go
+++ b/internal/fusefrontend/node_dir_ops.go
@@ -9,8 +9,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
"github.com/rfjakob/gocryptfs/v2/internal/nametransform"
@@ -34,7 +34,7 @@ func haveDsstore(entries []fuse.DirEntry) bool {
// should be a handle to the parent directory, cName is the name of the new
// directory and mode specifies the access permissions to use.
// If DeterministicNames is set, the diriv file is NOT created.
-func (n *Node) mkdirWithIv(dirfd int, cName string, mode uint32, context *fuse.Context) error {
+func (n *Node) mkdirWithIv(dirfd int, cName string, mode uint32, context *fuse.Caller) error {
rn := n.rootNode()
if rn.args.DeterministicNames {
@@ -77,7 +77,7 @@ func (n *Node) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.En
defer syscall.Close(dirfd)
rn := n.rootNode()
- var context *fuse.Context
+ var context *fuse.Caller
if rn.args.PreserveOwner {
context = toFuseCtx(ctx)
}
diff --git a/internal/fusefrontend/node_helpers.go b/internal/fusefrontend/node_helpers.go
index 3102275..43a8220 100644
--- a/internal/fusefrontend/node_helpers.go
+++ b/internal/fusefrontend/node_helpers.go
@@ -4,25 +4,23 @@ import (
"context"
"syscall"
- "github.com/hanwen/go-fuse/v2/fs"
+ "github.com/hanwen/go-fuse/v3/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
-// toFuseCtx tries to extract a fuse.Context from a generic context.Context.
-func toFuseCtx(ctx context.Context) (ctx2 *fuse.Context) {
+// toFuseCtx tries to extract a fuse.Caller from a generic context.Context.
+func toFuseCtx(ctx context.Context) *fuse.Caller {
if ctx == nil {
return nil
}
if caller, ok := fuse.FromContext(ctx); ok {
- ctx2 = &fuse.Context{
- Caller: *caller,
- }
+ return &caller
}
- return ctx2
+ return nil
}
// toNode casts a generic fs.InodeEmbedder into *Node. Also handles *RootNode
diff --git a/internal/fusefrontend/node_open_create.go b/internal/fusefrontend/node_open_create.go
index 622d5dc..9825884 100644
--- a/internal/fusefrontend/node_open_create.go
+++ b/internal/fusefrontend/node_open_create.go
@@ -5,8 +5,8 @@ import (
"os"
"syscall"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/nametransform"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
diff --git a/internal/fusefrontend/node_prepare_syscall.go b/internal/fusefrontend/node_prepare_syscall.go
index 03194df..5e439bf 100644
--- a/internal/fusefrontend/node_prepare_syscall.go
+++ b/internal/fusefrontend/node_prepare_syscall.go
@@ -6,7 +6,7 @@ import (
"github.com/rfjakob/gocryptfs/v2/internal/nametransform"
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
- "github.com/hanwen/go-fuse/v2/fs"
+ "github.com/hanwen/go-fuse/v3/fs"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
diff --git a/internal/fusefrontend/node_xattr.go b/internal/fusefrontend/node_xattr.go
index cbb0c37..0640943 100644
--- a/internal/fusefrontend/node_xattr.go
+++ b/internal/fusefrontend/node_xattr.go
@@ -7,7 +7,7 @@ import (
"strings"
"syscall"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
@@ -90,7 +90,7 @@ func (n *Node) Setxattr(ctx context.Context, attr string, data []byte, flags uin
// ACLs are passed through without encryption
if isAcl(attr) {
// result of setting an acl depends on the user doing it
- var context *fuse.Context
+ var context *fuse.Caller
if rn.args.PreserveOwner {
context = toFuseCtx(ctx)
}
diff --git a/internal/fusefrontend/node_xattr_darwin.go b/internal/fusefrontend/node_xattr_darwin.go
index 1d25f3d..420084f 100644
--- a/internal/fusefrontend/node_xattr_darwin.go
+++ b/internal/fusefrontend/node_xattr_darwin.go
@@ -5,8 +5,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
@@ -44,7 +44,7 @@ func (n *Node) getXAttr(cAttr string) (out []byte, errno syscall.Errno) {
return cData, 0
}
-func (n *Node) setXAttr(context *fuse.Context, cAttr string, cData []byte, flags uint32) (errno syscall.Errno) {
+func (n *Node) setXAttr(context *fuse.Caller, cAttr string, cData []byte, flags uint32) (errno syscall.Errno) {
dirfd, cName, errno := n.prepareAtSyscallMyself()
if errno != 0 {
return
diff --git a/internal/fusefrontend/node_xattr_freebsd.go b/internal/fusefrontend/node_xattr_freebsd.go
index 9698283..3f9c577 100644
--- a/internal/fusefrontend/node_xattr_freebsd.go
+++ b/internal/fusefrontend/node_xattr_freebsd.go
@@ -3,7 +3,7 @@ package fusefrontend
import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
)
const noSuchAttributeError = unix.ENOATTR
@@ -17,7 +17,7 @@ func (n *Node) getXAttr(cAttr string) (out []byte, errno unix.Errno) {
return nil, unix.EOPNOTSUPP
}
-func (n *Node) setXAttr(context *fuse.Context, cAttr string, cData []byte, flags uint32) (errno unix.Errno) {
+func (n *Node) setXAttr(context *fuse.Caller, cAttr string, cData []byte, flags uint32) (errno unix.Errno) {
// TODO
return unix.EOPNOTSUPP
}
diff --git a/internal/fusefrontend/node_xattr_linux.go b/internal/fusefrontend/node_xattr_linux.go
index 9964212..b1f8f39 100644
--- a/internal/fusefrontend/node_xattr_linux.go
+++ b/internal/fusefrontend/node_xattr_linux.go
@@ -6,8 +6,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
@@ -34,7 +34,7 @@ func (n *Node) getXAttr(cAttr string) (out []byte, errno syscall.Errno) {
return cData, 0
}
-func (n *Node) setXAttr(context *fuse.Context, cAttr string, cData []byte, flags uint32) (errno syscall.Errno) {
+func (n *Node) setXAttr(context *fuse.Caller, cAttr string, cData []byte, flags uint32) (errno syscall.Errno) {
dirfd, cName, errno := n.prepareAtSyscallMyself()
if errno != 0 {
return
diff --git a/internal/fusefrontend/prepare_syscall_test.go b/internal/fusefrontend/prepare_syscall_test.go
index 5945720..fb86592 100644
--- a/internal/fusefrontend/prepare_syscall_test.go
+++ b/internal/fusefrontend/prepare_syscall_test.go
@@ -8,7 +8,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
diff --git a/internal/fusefrontend/statx_linux.go b/internal/fusefrontend/statx_linux.go
index f9f87cf..3afaa05 100644
--- a/internal/fusefrontend/statx_linux.go
+++ b/internal/fusefrontend/statx_linux.go
@@ -4,8 +4,8 @@ import (
"context"
"syscall"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"golang.org/x/sys/unix"
"github.com/rfjakob/gocryptfs/v2/internal/inomap"
diff --git a/internal/fusefrontend/xattr_unit_test.go b/internal/fusefrontend/xattr_unit_test.go
index 7d8e32e..379b0dd 100644
--- a/internal/fusefrontend/xattr_unit_test.go
+++ b/internal/fusefrontend/xattr_unit_test.go
@@ -7,7 +7,7 @@ import (
"testing"
"time"
- "github.com/hanwen/go-fuse/v2/fs"
+ "github.com/hanwen/go-fuse/v3/fs"
"github.com/rfjakob/gocryptfs/v2/internal/contentenc"
"github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
diff --git a/internal/fusefrontend_reverse/file.go b/internal/fusefrontend_reverse/file.go
index bc917ac..02d8b1a 100644
--- a/internal/fusefrontend_reverse/file.go
+++ b/internal/fusefrontend_reverse/file.go
@@ -6,8 +6,8 @@ import (
"os"
"syscall"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/contentenc"
)
diff --git a/internal/fusefrontend_reverse/file_api_check.go b/internal/fusefrontend_reverse/file_api_check.go
index b7e59d4..3c02021 100644
--- a/internal/fusefrontend_reverse/file_api_check.go
+++ b/internal/fusefrontend_reverse/file_api_check.go
@@ -1,7 +1,7 @@
package fusefrontend_reverse
import (
- "github.com/hanwen/go-fuse/v2/fs"
+ "github.com/hanwen/go-fuse/v3/fs"
)
// Check that we have implemented the fs.File* interfaces
diff --git a/internal/fusefrontend_reverse/node.go b/internal/fusefrontend_reverse/node.go
index 30654e0..45050be 100644
--- a/internal/fusefrontend_reverse/node.go
+++ b/internal/fusefrontend_reverse/node.go
@@ -9,8 +9,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/contentenc"
"github.com/rfjakob/gocryptfs/v2/internal/pathiv"
diff --git a/internal/fusefrontend_reverse/node_api_check.go b/internal/fusefrontend_reverse/node_api_check.go
index eb608f9..6eb318a 100644
--- a/internal/fusefrontend_reverse/node_api_check.go
+++ b/internal/fusefrontend_reverse/node_api_check.go
@@ -1,7 +1,7 @@
package fusefrontend_reverse
import (
- "github.com/hanwen/go-fuse/v2/fs"
+ "github.com/hanwen/go-fuse/v3/fs"
)
// Check that we have implemented the fs.Node* interfaces
diff --git a/internal/fusefrontend_reverse/node_dir_ops.go b/internal/fusefrontend_reverse/node_dir_ops.go
index fdd15ce..eec188f 100644
--- a/internal/fusefrontend_reverse/node_dir_ops.go
+++ b/internal/fusefrontend_reverse/node_dir_ops.go
@@ -7,8 +7,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/configfile"
"github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
diff --git a/internal/fusefrontend_reverse/node_helpers.go b/internal/fusefrontend_reverse/node_helpers.go
index 8a15689..577693e 100644
--- a/internal/fusefrontend_reverse/node_helpers.go
+++ b/internal/fusefrontend_reverse/node_helpers.go
@@ -8,8 +8,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/pathiv"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
diff --git a/internal/fusefrontend_reverse/node_xattr_darwin.go b/internal/fusefrontend_reverse/node_xattr_darwin.go
index 6816a18..73bb4d5 100644
--- a/internal/fusefrontend_reverse/node_xattr_darwin.go
+++ b/internal/fusefrontend_reverse/node_xattr_darwin.go
@@ -3,7 +3,7 @@ package fusefrontend_reverse
import (
"syscall"
- "github.com/hanwen/go-fuse/v2/fs"
+ "github.com/hanwen/go-fuse/v3/fs"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
diff --git a/internal/fusefrontend_reverse/node_xattr_linux.go b/internal/fusefrontend_reverse/node_xattr_linux.go
index 3c574f5..2ebb213 100644
--- a/internal/fusefrontend_reverse/node_xattr_linux.go
+++ b/internal/fusefrontend_reverse/node_xattr_linux.go
@@ -4,7 +4,7 @@ import (
"fmt"
"syscall"
- "github.com/hanwen/go-fuse/v2/fs"
+ "github.com/hanwen/go-fuse/v3/fs"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
diff --git a/internal/fusefrontend_reverse/root_node.go b/internal/fusefrontend_reverse/root_node.go
index 461b25c..ea69fdc 100644
--- a/internal/fusefrontend_reverse/root_node.go
+++ b/internal/fusefrontend_reverse/root_node.go
@@ -10,8 +10,8 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/configfile"
"github.com/rfjakob/gocryptfs/v2/internal/contentenc"
diff --git a/internal/fusefrontend_reverse/virtualconf.go b/internal/fusefrontend_reverse/virtualconf.go
index 6780974..9643602 100644
--- a/internal/fusefrontend_reverse/virtualconf.go
+++ b/internal/fusefrontend_reverse/virtualconf.go
@@ -5,8 +5,8 @@ import (
"sync"
"syscall"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/configfile"
"github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
diff --git a/internal/fusefrontend_reverse/virtualnode.go b/internal/fusefrontend_reverse/virtualnode.go
index 95e71ab..648623c 100644
--- a/internal/fusefrontend_reverse/virtualnode.go
+++ b/internal/fusefrontend_reverse/virtualnode.go
@@ -5,8 +5,8 @@ import (
"log"
"syscall"
- "github.com/hanwen/go-fuse/v2/fs"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fs"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/configfile"
"github.com/rfjakob/gocryptfs/v2/internal/inomap"
diff --git a/internal/syscallcompat/asuser.go b/internal/syscallcompat/asuser.go
index 0c083ec..e924587 100644
--- a/internal/syscallcompat/asuser.go
+++ b/internal/syscallcompat/asuser.go
@@ -3,7 +3,7 @@ package syscallcompat
import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
)
// OpenatUser runs the Openat syscall in the context of a different user.
@@ -12,7 +12,7 @@ import (
//
// If `context` is nil, this function behaves like ordinary Openat (no
// user switching).
-func OpenatUser(dirfd int, path string, flags int, mode uint32, context *fuse.Context) (fd int, err error) {
+func OpenatUser(dirfd int, path string, flags int, mode uint32, context *fuse.Caller) (fd int, err error) {
f := func() (int, error) {
return Openat(dirfd, path, flags, mode)
}
@@ -23,7 +23,7 @@ func OpenatUser(dirfd int, path string, flags int, mode uint32, context *fuse.Co
// If `context` is nil, this function behaves like ordinary Mknodat.
//
// See OpenatUser() for how this works.
-func MknodatUser(dirfd int, path string, mode uint32, dev int, context *fuse.Context) (err error) {
+func MknodatUser(dirfd int, path string, mode uint32, dev int, context *fuse.Caller) (err error) {
f := func() (int, error) {
err := Mknodat(dirfd, path, mode, dev)
return -1, err
@@ -36,7 +36,7 @@ func MknodatUser(dirfd int, path string, mode uint32, dev int, context *fuse.Con
// If `context` is nil, this function behaves like ordinary Symlinkat.
//
// See OpenatUser() for how this works.
-func SymlinkatUser(oldpath string, newdirfd int, newpath string, context *fuse.Context) (err error) {
+func SymlinkatUser(oldpath string, newdirfd int, newpath string, context *fuse.Caller) (err error) {
f := func() (int, error) {
err := unix.Symlinkat(oldpath, newdirfd, newpath)
return -1, err
@@ -49,7 +49,7 @@ func SymlinkatUser(oldpath string, newdirfd int, newpath string, context *fuse.C
// If `context` is nil, this function behaves like ordinary Mkdirat.
//
// See OpenatUser() for how this works.
-func MkdiratUser(dirfd int, path string, mode uint32, context *fuse.Context) (err error) {
+func MkdiratUser(dirfd int, path string, mode uint32, context *fuse.Caller) (err error) {
f := func() (int, error) {
err := unix.Mkdirat(dirfd, path, mode)
return -1, err
diff --git a/internal/syscallcompat/asuser_darwin.go b/internal/syscallcompat/asuser_darwin.go
index 5da2782..70a1da8 100644
--- a/internal/syscallcompat/asuser_darwin.go
+++ b/internal/syscallcompat/asuser_darwin.go
@@ -4,14 +4,14 @@ import (
"runtime"
"syscall"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
)
// asUser runs `f()` under the effective uid, gid, groups specified
// in `context`.
//
// If `context` is nil, `f()` is executed directly without switching user id.
-func asUser(f func() (int, error), context *fuse.Context) (int, error) {
+func asUser(f func() (int, error), context *fuse.Caller) (int, error) {
if context == nil {
return f()
}
diff --git a/internal/syscallcompat/asuser_freebsd.go b/internal/syscallcompat/asuser_freebsd.go
index dfa8e18..4d349be 100644
--- a/internal/syscallcompat/asuser_freebsd.go
+++ b/internal/syscallcompat/asuser_freebsd.go
@@ -3,7 +3,7 @@ package syscallcompat
import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
@@ -15,7 +15,7 @@ import (
//
// FreeBSD does not support changing uid/gid per thread. If context is not nil,
// an error is returned.
-func asUser(f func() (int, error), context *fuse.Context) (int, error) {
+func asUser(f func() (int, error), context *fuse.Caller) (int, error) {
if context == nil {
return f()
}
diff --git a/internal/syscallcompat/asuser_linux.go b/internal/syscallcompat/asuser_linux.go
index 39e3ff2..4e11973 100644
--- a/internal/syscallcompat/asuser_linux.go
+++ b/internal/syscallcompat/asuser_linux.go
@@ -7,14 +7,14 @@ import (
"strconv"
"strings"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
)
// asUser runs `f()` under the effective uid, gid, groups specified
// in `context`.
//
// If `context` is nil, `f()` is executed directly without switching user id.
-func asUser(f func() (int, error), context *fuse.Context) (int, error) {
+func asUser(f func() (int, error), context *fuse.Caller) (int, error) {
if context == nil {
return f()
}
diff --git a/internal/syscallcompat/getdents_linux.go b/internal/syscallcompat/getdents_linux.go
index da3868f..f3a6b83 100644
--- a/internal/syscallcompat/getdents_linux.go
+++ b/internal/syscallcompat/getdents_linux.go
@@ -15,7 +15,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
diff --git a/internal/syscallcompat/getdents_other.go b/internal/syscallcompat/getdents_other.go
index 1ed5ecf..650861c 100644
--- a/internal/syscallcompat/getdents_other.go
+++ b/internal/syscallcompat/getdents_other.go
@@ -6,7 +6,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
)
func fillDirEntries(fd int, names []string) ([]fuse.DirEntry, error) {
diff --git a/internal/syscallcompat/getdents_test.go b/internal/syscallcompat/getdents_test.go
index c9e6a99..8231d59 100644
--- a/internal/syscallcompat/getdents_test.go
+++ b/internal/syscallcompat/getdents_test.go
@@ -12,7 +12,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
)
var emulate = false
diff --git a/internal/syscallcompat/sys_darwin.go b/internal/syscallcompat/sys_darwin.go
index 07eb30a..7d39071 100644
--- a/internal/syscallcompat/sys_darwin.go
+++ b/internal/syscallcompat/sys_darwin.go
@@ -9,7 +9,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
)
const (
diff --git a/internal/syscallcompat/sys_freebsd.go b/internal/syscallcompat/sys_freebsd.go
index 9c8c9e8..626c8b2 100644
--- a/internal/syscallcompat/sys_freebsd.go
+++ b/internal/syscallcompat/sys_freebsd.go
@@ -6,7 +6,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
@@ -81,7 +81,7 @@ func FchmodatNofollow(dirfd int, path string, mode uint32) (err error) {
// the operation (see fuse-xfstests generic/375).
//
// If `context` is nil, this function behaves like ordinary Lsetxattr.
-func LsetxattrUser(path string, attr string, data []byte, flags int, context *fuse.Context) (err error) {
+func LsetxattrUser(path string, attr string, data []byte, flags int, context *fuse.Caller) (err error) {
f := func() (int, error) {
err := unix.Lsetxattr(path, attr, data, flags)
return -1, err
diff --git a/internal/syscallcompat/sys_linux.go b/internal/syscallcompat/sys_linux.go
index 91f865a..dad7187 100644
--- a/internal/syscallcompat/sys_linux.go
+++ b/internal/syscallcompat/sys_linux.go
@@ -9,7 +9,7 @@ import (
"golang.org/x/sys/unix"
- "github.com/hanwen/go-fuse/v2/fuse"
+ "github.com/hanwen/go-fuse/v3/fuse"
"github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
@@ -135,7 +135,7 @@ func FchmodatNofollow(dirfd int, path string, mode uint32) (err error) {
// the operation (see fuse-xfstests generic/375).
//
// If `context` is nil, this function behaves like ordinary Lsetxattr.
-func LsetxattrUser(path string, attr string, data []byte, flags int, context *fuse.Context) (err error) {
+func LsetxattrUser(path string, attr string, data []byte, flags int, context *fuse.Caller) (err error) {
f := func() (int, error) {
err := unix.Lsetxattr(path, attr, data, flags)
return -1, err