diff --git a/go.mod b/go.mod index d5e37dc76..6cce5cff3 100644 --- a/go.mod +++ b/go.mod @@ -135,7 +135,6 @@ require ( github.com/gin-gonic/gin v1.11.0 github.com/golang-jwt/jwt/v5 v5.3.0 github.com/google/flatbuffers/go v0.0.0-20230108230133-3b8644d32c50 - github.com/hanwen/go-fuse/v2 v2.9.0 github.com/hashicorp/raft v1.7.3 github.com/hashicorp/raft-boltdb/v2 v2.3.1 github.com/hashicorp/vault/api v1.22.0 @@ -152,6 +151,7 @@ require ( github.com/rdleal/intervalst v1.5.0 github.com/redis/go-redis/v9 v9.17.2 github.com/schollz/progressbar/v3 v3.19.0 + github.com/seaweedfs/go-fuse/v2 v2.9.1 github.com/shirou/gopsutil/v4 v4.25.11 github.com/tarantool/go-tarantool/v2 v2.4.1 github.com/tikv/client-go/v2 v2.0.7 diff --git a/go.sum b/go.sum index 3aa779eb1..90276eb64 100644 --- a/go.sum +++ b/go.sum @@ -1187,8 +1187,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+u github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -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/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -1621,6 +1619,8 @@ github.com/schollz/progressbar/v3 v3.19.0 h1:Ea18xuIRQXLAUidVDox3AbwfUhD0/1Ivohy github.com/schollz/progressbar/v3 v3.19.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec= github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138 h1:bX1vBF7GQjPeFQsCAZ8gCQGS/nJQnekL7gZ4Qg/pF4E= github.com/seaweedfs/cockroachdb-parser v0.0.0-20251021184156-909763b17138/go.mod h1:JSKCh6uCHBz91lQYFYHCyTrSVIPge4SUFVn28iwMNB0= +github.com/seaweedfs/go-fuse/v2 v2.9.1 h1:gnKmfrKreCRGJmekGz5WMnNZqXEf9s9+V2hdWQdvx88= +github.com/seaweedfs/go-fuse/v2 v2.9.1/go.mod h1:zABdmWEa6A0bwaBeEOBUeUkGIZlxUhcdv+V1Dcc/U/I= github.com/seaweedfs/goexif v1.0.3 h1:ve/OjI7dxPW8X9YQsv3JuVMaxEyF9Rvfd04ouL+Bz30= github.com/seaweedfs/goexif v1.0.3/go.mod h1:Oni780Z236sXpIQzk1XoJlTwqrJ02smEin9zQeff7Fk= github.com/seaweedfs/raft v1.1.6 h1:e83Xn0boscPnuSiBllUPeWRVS6JKrqJPYBozgFyBiC0= diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index a4cbfe820..a31645a13 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -18,7 +18,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/util/version" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/mount" "github.com/seaweedfs/seaweedfs/weed/mount/meta_cache" @@ -216,12 +216,8 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { fuseMountOptions.Options = append(fuseMountOptions.Options, fmt.Sprintf("iosize=%d", ioSizeMB*1024*1024)) } - if option.writebackCache != nil && *option.writebackCache { - fuseMountOptions.Options = append(fuseMountOptions.Options, "writeback_cache") - } - if option.asyncDio != nil && *option.asyncDio { - fuseMountOptions.Options = append(fuseMountOptions.Options, "async_dio") - } + fuseMountOptions.EnableWriteback = *option.writebackCache + fuseMountOptions.EnableAsyncDio = *option.asyncDio if option.cacheSymlink != nil && *option.cacheSymlink { fuseMountOptions.EnableSymlinkCaching = true } diff --git a/weed/mount/error_classifier.go b/weed/mount/error_classifier.go index b80ba56c8..893b893b9 100644 --- a/weed/mount/error_classifier.go +++ b/weed/mount/error_classifier.go @@ -4,7 +4,7 @@ import ( "strings" "syscall" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/weed/mount/inode_to_path.go b/weed/mount/inode_to_path.go index 444c1930a..9473caaa9 100644 --- a/weed/mount/inode_to_path.go +++ b/weed/mount/inode_to_path.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/util" ) diff --git a/weed/mount/weedfs.go b/weed/mount/weedfs.go index 1aac3258c..1234fa005 100644 --- a/weed/mount/weedfs.go +++ b/weed/mount/weedfs.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "time" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "google.golang.org/grpc" "github.com/seaweedfs/seaweedfs/weed/filer" @@ -26,7 +26,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/util/version" "github.com/seaweedfs/seaweedfs/weed/wdclient" - "github.com/hanwen/go-fuse/v2/fs" + "github.com/seaweedfs/go-fuse/v2/fs" ) type Option struct { diff --git a/weed/mount/weedfs_attr.go b/weed/mount/weedfs_attr.go index b79b0629a..534402998 100644 --- a/weed/mount/weedfs_attr.go +++ b/weed/mount/weedfs_attr.go @@ -5,7 +5,7 @@ import ( "syscall" "time" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" diff --git a/weed/mount/weedfs_attr_darwin.go b/weed/mount/weedfs_attr_darwin.go index e7767d4a6..044cc5fff 100644 --- a/weed/mount/weedfs_attr_darwin.go +++ b/weed/mount/weedfs_attr_darwin.go @@ -1,7 +1,7 @@ package mount import ( - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" ) func setBlksize(out *fuse.Attr, size uint32) { diff --git a/weed/mount/weedfs_attr_freebsd.go b/weed/mount/weedfs_attr_freebsd.go index e7767d4a6..044cc5fff 100644 --- a/weed/mount/weedfs_attr_freebsd.go +++ b/weed/mount/weedfs_attr_freebsd.go @@ -1,7 +1,7 @@ package mount import ( - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" ) func setBlksize(out *fuse.Attr, size uint32) { diff --git a/weed/mount/weedfs_attr_linux.go b/weed/mount/weedfs_attr_linux.go index 56be62e62..458b908e3 100644 --- a/weed/mount/weedfs_attr_linux.go +++ b/weed/mount/weedfs_attr_linux.go @@ -1,7 +1,7 @@ package mount import ( - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" ) func setBlksize(out *fuse.Attr, size uint32) { diff --git a/weed/mount/weedfs_dir_lookup.go b/weed/mount/weedfs_dir_lookup.go index af12e93a8..de56551df 100644 --- a/weed/mount/weedfs_dir_lookup.go +++ b/weed/mount/weedfs_dir_lookup.go @@ -1,7 +1,7 @@ package mount import ( - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" diff --git a/weed/mount/weedfs_dir_mkrm.go b/weed/mount/weedfs_dir_mkrm.go index 535816d1f..654f3dee5 100644 --- a/weed/mount/weedfs_dir_mkrm.go +++ b/weed/mount/weedfs_dir_mkrm.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" diff --git a/weed/mount/weedfs_dir_read.go b/weed/mount/weedfs_dir_read.go index 325512c37..0d749ad97 100644 --- a/weed/mount/weedfs_dir_read.go +++ b/weed/mount/weedfs_dir_read.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/mount/meta_cache" diff --git a/weed/mount/weedfs_file_copy_range.go b/weed/mount/weedfs_file_copy_range.go index 2f9e3a4b2..0b8f65589 100644 --- a/weed/mount/weedfs_file_copy_range.go +++ b/weed/mount/weedfs_file_copy_range.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/util" diff --git a/weed/mount/weedfs_file_io.go b/weed/mount/weedfs_file_io.go index 04fe7f21c..120e10427 100644 --- a/weed/mount/weedfs_file_io.go +++ b/weed/mount/weedfs_file_io.go @@ -1,7 +1,7 @@ package mount import ( - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/glog" ) diff --git a/weed/mount/weedfs_file_lseek.go b/weed/mount/weedfs_file_lseek.go index a7e3a2b46..9a1d1d2d7 100644 --- a/weed/mount/weedfs_file_lseek.go +++ b/weed/mount/weedfs_file_lseek.go @@ -6,7 +6,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/util" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" diff --git a/weed/mount/weedfs_file_mkrm.go b/weed/mount/weedfs_file_mkrm.go index 4fcaea4fa..3ec3ed91e 100644 --- a/weed/mount/weedfs_file_mkrm.go +++ b/weed/mount/weedfs_file_mkrm.go @@ -6,7 +6,7 @@ import ( "syscall" "time" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" diff --git a/weed/mount/weedfs_file_read.go b/weed/mount/weedfs_file_read.go index c85478cd0..3044c3a76 100644 --- a/weed/mount/weedfs_file_read.go +++ b/weed/mount/weedfs_file_read.go @@ -8,7 +8,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/util" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/glog" ) diff --git a/weed/mount/weedfs_file_sync.go b/weed/mount/weedfs_file_sync.go index 60d272eff..e8fff04a7 100644 --- a/weed/mount/weedfs_file_sync.go +++ b/weed/mount/weedfs_file_sync.go @@ -6,7 +6,7 @@ import ( "syscall" "time" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" diff --git a/weed/mount/weedfs_file_write.go b/weed/mount/weedfs_file_write.go index 91fb718ee..c1ddb70d3 100644 --- a/weed/mount/weedfs_file_write.go +++ b/weed/mount/weedfs_file_write.go @@ -5,7 +5,7 @@ import ( "syscall" "time" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/util" ) diff --git a/weed/mount/weedfs_filehandle.go b/weed/mount/weedfs_filehandle.go index f3add0378..1f3968ffe 100644 --- a/weed/mount/weedfs_filehandle.go +++ b/weed/mount/weedfs_filehandle.go @@ -1,7 +1,7 @@ package mount import ( - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" ) diff --git a/weed/mount/weedfs_link.go b/weed/mount/weedfs_link.go index e0cfa036e..0960b7e47 100644 --- a/weed/mount/weedfs_link.go +++ b/weed/mount/weedfs_link.go @@ -6,7 +6,7 @@ import ( "syscall" "time" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" diff --git a/weed/mount/weedfs_rename.go b/weed/mount/weedfs_rename.go index b52e312d4..9e5898093 100644 --- a/weed/mount/weedfs_rename.go +++ b/weed/mount/weedfs_rename.go @@ -7,8 +7,8 @@ import ( "strings" "syscall" - "github.com/hanwen/go-fuse/v2/fs" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fs" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" diff --git a/weed/mount/weedfs_stats.go b/weed/mount/weedfs_stats.go index 28e992158..3e8d9f3bd 100644 --- a/weed/mount/weedfs_stats.go +++ b/weed/mount/weedfs_stats.go @@ -3,7 +3,7 @@ package mount import ( "context" "fmt" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "math" diff --git a/weed/mount/weedfs_symlink.go b/weed/mount/weedfs_symlink.go index 9ef2ffca2..a53312984 100644 --- a/weed/mount/weedfs_symlink.go +++ b/weed/mount/weedfs_symlink.go @@ -7,7 +7,7 @@ import ( "syscall" "time" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" diff --git a/weed/mount/weedfs_unsupported.go b/weed/mount/weedfs_unsupported.go index a8342a2fc..a20ab2bc3 100644 --- a/weed/mount/weedfs_unsupported.go +++ b/weed/mount/weedfs_unsupported.go @@ -1,6 +1,6 @@ package mount -import "github.com/hanwen/go-fuse/v2/fuse" +import "github.com/seaweedfs/go-fuse/v2/fuse" // https://github.com/libfuse/libfuse/blob/48ae2e72b39b6a31cb2194f6f11786b7ca06aac6/include/fuse.h#L778 diff --git a/weed/mount/weedfs_xattr.go b/weed/mount/weedfs_xattr.go index 6360164a5..ade1d3d84 100644 --- a/weed/mount/weedfs_xattr.go +++ b/weed/mount/weedfs_xattr.go @@ -8,7 +8,7 @@ import ( "strings" "syscall" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" sys "golang.org/x/sys/unix" ) diff --git a/weed/mount/weedfs_xattr_freebsd.go b/weed/mount/weedfs_xattr_freebsd.go index 01cb748e5..c4238cb8f 100644 --- a/weed/mount/weedfs_xattr_freebsd.go +++ b/weed/mount/weedfs_xattr_freebsd.go @@ -3,7 +3,7 @@ package mount import ( "syscall" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" ) func (wfs *WFS) GetXAttr(cancel <-chan struct{}, header *fuse.InHeader, attr string, dest []byte) (size uint32, code fuse.Status) { diff --git a/weed/mount/wfs_save.go b/weed/mount/wfs_save.go index d167e4e5a..f3a4694f6 100644 --- a/weed/mount/wfs_save.go +++ b/weed/mount/wfs_save.go @@ -5,7 +5,7 @@ import ( "fmt" "syscall" - "github.com/hanwen/go-fuse/v2/fuse" + "github.com/seaweedfs/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"