From ec74d1d2f4217a9a337d1db9902f32ae2aecaf33 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sun, 17 May 2020 14:18:23 +0200 Subject: Update go-fuse import path to github.com/hanwen/go-fuse/v2 We need https://github.com/hanwen/go-fuse/commit/fd7328faf9fdf75709f7ba7df7072aaf4eeb18b3 to fix a crash reported in https://github.com/rfjakob/gocryptfs/issues/430 : 2019/10/30 17:14:16 Unknown opcode 2016 panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x20 pc=0x508d38] This patch is only in the v2.x.x branch. Upgrade to v2, as the old API is also supported there. Running git grep hanwen/go-fuse | grep -v hanwen/go-fuse/v2 to check for forgotten references comes back clean. --- 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_linux.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'internal/syscallcompat') diff --git a/internal/syscallcompat/getdents_linux.go b/internal/syscallcompat/getdents_linux.go index 3853f2d..2674cb3 100644 --- a/internal/syscallcompat/getdents_linux.go +++ b/internal/syscallcompat/getdents_linux.go @@ -14,7 +14,7 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/tlog" ) diff --git a/internal/syscallcompat/getdents_other.go b/internal/syscallcompat/getdents_other.go index 6d08a9b..82932db 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/fuse" + "github.com/hanwen/go-fuse/v2/fuse" ) // emulateGetdents reads all directory entries from the open directory "fd" diff --git a/internal/syscallcompat/getdents_test.go b/internal/syscallcompat/getdents_test.go index bfcc50a..cb95b7c 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/fuse" + "github.com/hanwen/go-fuse/v2/fuse" ) var emulate = false diff --git a/internal/syscallcompat/sys_darwin.go b/internal/syscallcompat/sys_darwin.go index 699e38c..d9e6017 100644 --- a/internal/syscallcompat/sys_darwin.go +++ b/internal/syscallcompat/sys_darwin.go @@ -10,7 +10,7 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" ) const ( diff --git a/internal/syscallcompat/sys_linux.go b/internal/syscallcompat/sys_linux.go index ac7891a..e2b19bb 100644 --- a/internal/syscallcompat/sys_linux.go +++ b/internal/syscallcompat/sys_linux.go @@ -13,7 +13,7 @@ import ( "golang.org/x/sys/unix" - "github.com/hanwen/go-fuse/fuse" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/rfjakob/gocryptfs/internal/tlog" ) -- cgit v1.2.3