From 173e5056ef8beaa461c5a6665b75e1d97503c5ac Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Thu, 19 Nov 2026 21:14:58 +0100 Subject: go.mod: upgrade to go-fuse v3 (current master 1ffd5bd2bfc64) 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 --- build.bash | 2 +- cli_args.go | 2 +- fsck.go | 10 +++++----- go.mod | 2 +- go.sum | 21 +++------------------ internal/contentenc/content.go | 2 +- internal/fusefrontend/args.go | 2 +- internal/fusefrontend/file.go | 6 +++--- internal/fusefrontend/file_allocate_truncate.go | 2 +- internal/fusefrontend/file_api_check.go | 2 +- internal/fusefrontend/file_dir_ops.go | 4 ++-- internal/fusefrontend/file_holes.go | 2 +- internal/fusefrontend/file_setattr.go | 4 ++-- internal/fusefrontend/node.go | 4 ++-- internal/fusefrontend/node_api_check.go | 2 +- internal/fusefrontend/node_dir_ops.go | 8 ++++---- internal/fusefrontend/node_helpers.go | 14 ++++++-------- internal/fusefrontend/node_open_create.go | 4 ++-- internal/fusefrontend/node_prepare_syscall.go | 2 +- internal/fusefrontend/node_xattr.go | 4 ++-- internal/fusefrontend/node_xattr_darwin.go | 6 +++--- internal/fusefrontend/node_xattr_freebsd.go | 4 ++-- internal/fusefrontend/node_xattr_linux.go | 6 +++--- internal/fusefrontend/prepare_syscall_test.go | 2 +- internal/fusefrontend/statx_linux.go | 4 ++-- internal/fusefrontend/xattr_unit_test.go | 2 +- internal/fusefrontend_reverse/file.go | 4 ++-- internal/fusefrontend_reverse/file_api_check.go | 2 +- internal/fusefrontend_reverse/node.go | 4 ++-- internal/fusefrontend_reverse/node_api_check.go | 2 +- internal/fusefrontend_reverse/node_dir_ops.go | 4 ++-- internal/fusefrontend_reverse/node_helpers.go | 4 ++-- internal/fusefrontend_reverse/node_xattr_darwin.go | 2 +- internal/fusefrontend_reverse/node_xattr_linux.go | 2 +- internal/fusefrontend_reverse/root_node.go | 4 ++-- internal/fusefrontend_reverse/virtualconf.go | 4 ++-- internal/fusefrontend_reverse/virtualnode.go | 4 ++-- internal/syscallcompat/asuser.go | 10 +++++----- internal/syscallcompat/asuser_darwin.go | 4 ++-- internal/syscallcompat/asuser_freebsd.go | 4 ++-- internal/syscallcompat/asuser_linux.go | 4 ++-- internal/syscallcompat/getdents_linux.go | 2 +- internal/syscallcompat/getdents_other.go | 2 +- internal/syscallcompat/getdents_test.go | 2 +- internal/syscallcompat/sys_darwin.go | 2 +- internal/syscallcompat/sys_freebsd.go | 4 ++-- internal/syscallcompat/sys_linux.go | 4 ++-- main.go | 2 +- mount.go | 4 ++-- version.go | 2 +- 50 files changed, 94 insertions(+), 111 deletions(-) diff --git a/build.bash b/build.bash index 4623a4f..ddc7aff 100755 --- a/build.bash +++ b/build.bash @@ -43,7 +43,7 @@ if [[ -d vendor/github.com/hanwen/go-fuse ]] ; then else # go-fuse version according to Go Modules FAIL=0 - OUT=$(go list -m github.com/hanwen/go-fuse/v2 | cut -d' ' -f2-) || FAIL=1 + OUT=$(go list -m github.com/hanwen/go-fuse/v3 | cut -d' ' -f2-) || FAIL=1 if [[ $FAIL -eq 0 ]]; then GITVERSIONFUSE=$OUT else diff --git a/cli_args.go b/cli_args.go index 52061e3..fd344f9 100644 --- a/cli_args.go +++ b/cli_args.go @@ -16,7 +16,7 @@ import ( flag "github.com/spf13/pflag" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/hanwen/go-fuse/v3/fuse" "github.com/rfjakob/gocryptfs/v2/internal/configfile" "github.com/rfjakob/gocryptfs/v2/internal/exitcodes" diff --git a/fsck.go b/fsck.go index 7f25269..406df24 100644 --- a/fsck.go +++ b/fsck.go @@ -12,8 +12,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/exitcodes" "github.com/rfjakob/gocryptfs/v2/internal/fusefrontend" @@ -183,10 +183,10 @@ func (ck *fsckObj) file(inode *fs.Inode, relPath string, attr *fuse.Attr) { fmt.Printf("fsck: error reading file %q (inum %d): %v\n", relPath, attr.Ino, errno) return } - data, status := res.Bytes(buf) - if !status.Ok() { + data, errno := res.Bytes(buf) + if errno != 0 { ck.markCorrupt(relPath) - fmt.Printf("fsck: error reading file %q (inum %d): %v\n", relPath, attr.Ino, status) + fmt.Printf("fsck: error reading file %q (inum %d): %v\n", relPath, attr.Ino, errno) return } // Short read means EOF diff --git a/go.mod b/go.mod index e8ab9d5..d7c607b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.26.0 require ( github.com/aperturerobotics/jacobsa-crypto v1.1.0 - github.com/hanwen/go-fuse/v2 v2.12.1-0.20261018182834-2d50fff207d7 + github.com/hanwen/go-fuse/v3 v3.0.0-20261116095543-1ffd5bd2bfc6 github.com/moby/sys/mountinfo v0.7.2 github.com/pkg/xattr v0.4.9 github.com/rfjakob/eme v1.2.0 diff --git a/go.sum b/go.sum index 3d67bfc..7b49dbb 100644 --- a/go.sum +++ b/go.sum @@ -2,12 +2,8 @@ github.com/aperturerobotics/jacobsa-crypto v1.1.0 h1:0hig54FMzU80OHrqSfqmj/W8Hyd github.com/aperturerobotics/jacobsa-crypto v1.1.0/go.mod h1:buWU1iY+FjIcfpb1aYfFJZfl07WlS7O30lTyC2iwjv8= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/hanwen/go-fuse/v2 v2.9.0 h1:0AOGUkHtbOVeyGLr0tXupiid1Vg7QB7M6YUcdmVdC58= -github.com/hanwen/go-fuse/v2 v2.9.0/go.mod h1:yE6D2PqWwm3CbYRxFXV9xUd8Md5d6NG0WBs5spCswmI= -github.com/hanwen/go-fuse/v2 v2.12.1-0.20261018182834-2d50fff207d7 h1:R2ys6Ffwlr8z/5DnNxTdCnCTCSUJQVk+iKgAO2BojFY= -github.com/hanwen/go-fuse/v2 v2.12.1-0.20261018182834-2d50fff207d7/go.mod h1:Jhm1VRAQoI4MYiawzVhc0K3StCLBob07TTT37CwmNpM= -github.com/hanwen/go-fuse/v2 v2.12.1 h1:b6NXOPCraS9NvN4vtHZXDN1nsNKdoDlyafWxWnuO30Q= -github.com/hanwen/go-fuse/v2 v2.12.1/go.mod h1:Jhm1VRAQoI4MYiawzVhc0K3StCLBob07TTT37CwmNpM= +github.com/hanwen/go-fuse/v3 v3.0.0-20261116095543-1ffd5bd2bfc6 h1:eIxsbxxSTadME+nmV1zkriSEbXMWQKYHXx60TjQ9Ni8= +github.com/hanwen/go-fuse/v3 v3.0.0-20261116095543-1ffd5bd2bfc6/go.mod h1:SCxRJRFctAhRS3Pv+W41hSqeqBHXB8PysC39x97gCmY= github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd h1:9GCSedGjMcLZCrusBZuo4tyKLpKUPenUUqi34AkuFmA= github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd/go.mod h1:TlmyIZDpGmwRoTWiakdr+HA1Tukze6C6XbRVidYq02M= github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff h1:2xRHTvkpJ5zJmglXLRqHiZQNjUoOkhUyhTAhEQvPAWw= @@ -28,31 +24,20 @@ github.com/rfjakob/eme v1.2.0 h1:8dAHL+WVAw06+7DkRKnRiFp1JL3QjcJEZFqDnndUaSI= github.com/rfjakob/eme v1.2.0/go.mod h1:cVvpasglm/G3ngEfcfT/Wt0GwhkuO32pf/poW6Nyk1k= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= -golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= golang.org/x/crypto v0.58.0 h1:COkYLr4k7nDI4r6QtMML2AfzeIswWHAJthLS6K/M/54= golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w= -golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w= -golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ= golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU= +golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= -golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= -golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= golang.org/x/term v0.47.0 h1:cpyOwQkr2Nzxe2p6KnrTG7Ei2wtzjsuSjhpXXepZ/BM= golang.org/x/term v0.47.0/go.mod h1:efAfAuG6RKABvg1ArGebRkvX6LXul14SM67o2e4mUCY= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/text v0.43.0 h1:1QivrlhwAsnMOcqgOdl9my7s9OyZl8O5/UGUTJVXoWc= golang.org/x/text v0.43.0/go.mod h1:hbSIYA/amXcRXTFSZqh8tWHEoqRvvbKPJ2uz/KU+a+s= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= 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 diff --git a/main.go b/main.go index 62a7985..cf1e2db 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/hanwen/go-fuse/v3/fuse" "github.com/rfjakob/gocryptfs/v2/internal/configfile" "github.com/rfjakob/gocryptfs/v2/internal/contentenc" diff --git a/mount.go b/mount.go index fd6c313..10df357 100644 --- a/mount.go +++ b/mount.go @@ -18,8 +18,8 @@ import ( "golang.org/x/crypto/chacha20poly1305" - "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/version.go b/version.go index 22c780b..7f7c6b3 100644 --- a/version.go +++ b/version.go @@ -66,7 +66,7 @@ func versionFromBuildInfo() { } if GitVersionFuse == gitVersionFuseNotSet { for _, m := range info.Deps { - if m.Path == "github.com/hanwen/go-fuse/v2" { + if m.Path == "github.com/hanwen/go-fuse/v3" { GitVersionFuse = m.Version if m.Replace != nil { GitVersionFuse = m.Replace.Version -- cgit v1.2.3