summaryrefslogtreecommitdiff
path: root/internal/fusefrontend
diff options
context:
space:
mode:
authorJakob Unterwurzacher2021-08-23 15:05:15 +0200
committerJakob Unterwurzacher2021-08-23 15:05:15 +0200
commit69d88505fd7f4cb0d9e4f1918de296342fe05858 (patch)
treebbe102cb74b8d17b39ef16e3ab9b32cf94a314a4 /internal/fusefrontend
parentc9abfc8f06e1e0ce8e8b7ca480507647572a5df7 (diff)
go mod: declare module version v2
Our git version is v2+ for some time now, but go.mod still declared v1. Hopefully making both match makes https://pkg.go.dev/github.com/rfjakob/gocryptfs/v2 work. All the import paths have been fixed like this: find . -name \*.go | xargs sed -i s%github.com/rfjakob/gocryptfs/%github.com/rfjakob/gocryptfs/v2/%
Diffstat (limited to 'internal/fusefrontend')
-rw-r--r--internal/fusefrontend/args.go2
-rw-r--r--internal/fusefrontend/ctlsock_interface.go8
-rw-r--r--internal/fusefrontend/dircache.go2
-rw-r--r--internal/fusefrontend/file.go14
-rw-r--r--internal/fusefrontend/file_allocate_truncate.go4
-rw-r--r--internal/fusefrontend/file_holes.go2
-rw-r--r--internal/fusefrontend/file_setattr.go4
-rw-r--r--internal/fusefrontend/node.go6
-rw-r--r--internal/fusefrontend/node_dir_ops.go10
-rw-r--r--internal/fusefrontend/node_helpers.go4
-rw-r--r--internal/fusefrontend/node_open_create.go6
-rw-r--r--internal/fusefrontend/node_prepare_syscall.go4
-rw-r--r--internal/fusefrontend/node_xattr.go6
-rw-r--r--internal/fusefrontend/node_xattr_darwin.go2
-rw-r--r--internal/fusefrontend/node_xattr_linux.go2
-rw-r--r--internal/fusefrontend/prepare_syscall_test.go4
-rw-r--r--internal/fusefrontend/root_node.go14
-rw-r--r--internal/fusefrontend/xattr_unit_test.go6
18 files changed, 50 insertions, 50 deletions
diff --git a/internal/fusefrontend/args.go b/internal/fusefrontend/args.go
index e20987b..677ffd6 100644
--- a/internal/fusefrontend/args.go
+++ b/internal/fusefrontend/args.go
@@ -42,7 +42,7 @@ type Args struct {
// Suid is true if the filesystem has been mounted with the "-suid" flag.
// If it is false, we can ignore the GETXATTR "security.capability" calls,
// which are a performance problem for writes. See
- // https://github.com/rfjakob/gocryptfs/issues/515 for details.
+ // https://github.com/rfjakob/gocryptfs/v2/issues/515 for details.
Suid bool
// Enable the FUSE kernel_cache option
KernelCache bool
diff --git a/internal/fusefrontend/ctlsock_interface.go b/internal/fusefrontend/ctlsock_interface.go
index 87f0dc3..2afe4e0 100644
--- a/internal/fusefrontend/ctlsock_interface.go
+++ b/internal/fusefrontend/ctlsock_interface.go
@@ -6,10 +6,10 @@ import (
"strings"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/ctlsocksrv"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/ctlsocksrv"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
var _ ctlsocksrv.Interface = &RootNode{} // Verify that interface is implemented.
diff --git a/internal/fusefrontend/dircache.go b/internal/fusefrontend/dircache.go
index 8c285fa..83a1e66 100644
--- a/internal/fusefrontend/dircache.go
+++ b/internal/fusefrontend/dircache.go
@@ -7,7 +7,7 @@ import (
"syscall"
"time"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const (
diff --git a/internal/fusefrontend/file.go b/internal/fusefrontend/file.go
index ef043ae..9481abf 100644
--- a/internal/fusefrontend/file.go
+++ b/internal/fusefrontend/file.go
@@ -17,13 +17,13 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/inomap"
- "github.com/rfjakob/gocryptfs/internal/openfiletable"
- "github.com/rfjakob/gocryptfs/internal/serialize_reads"
- "github.com/rfjakob/gocryptfs/internal/stupidgcm"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/inomap"
+ "github.com/rfjakob/gocryptfs/v2/internal/openfiletable"
+ "github.com/rfjakob/gocryptfs/v2/internal/serialize_reads"
+ "github.com/rfjakob/gocryptfs/v2/internal/stupidgcm"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// File implements the go-fuse v2 API (github.com/hanwen/go-fuse/v2/fs)
diff --git a/internal/fusefrontend/file_allocate_truncate.go b/internal/fusefrontend/file_allocate_truncate.go
index f4e6099..fddcfe8 100644
--- a/internal/fusefrontend/file_allocate_truncate.go
+++ b/internal/fusefrontend/file_allocate_truncate.go
@@ -11,8 +11,8 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// FALLOC_DEFAULT is a "normal" fallocate operation
diff --git a/internal/fusefrontend/file_holes.go b/internal/fusefrontend/file_holes.go
index cb44803..f35fa70 100644
--- a/internal/fusefrontend/file_holes.go
+++ b/internal/fusefrontend/file_holes.go
@@ -9,7 +9,7 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// Will a write to plaintext offset "targetOff" create a file hole in the
diff --git a/internal/fusefrontend/file_setattr.go b/internal/fusefrontend/file_setattr.go
index 0d6dc48..fe4bc47 100644
--- a/internal/fusefrontend/file_setattr.go
+++ b/internal/fusefrontend/file_setattr.go
@@ -7,8 +7,8 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
func (f *File) Setattr(ctx context.Context, in *fuse.SetAttrIn, out *fuse.AttrOut) (errno syscall.Errno) {
diff --git a/internal/fusefrontend/node.go b/internal/fusefrontend/node.go
index 0f63fdf..99d337f 100644
--- a/internal/fusefrontend/node.go
+++ b/internal/fusefrontend/node.go
@@ -9,9 +9,9 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// Node is a file or directory in the filesystem tree
diff --git a/internal/fusefrontend/node_dir_ops.go b/internal/fusefrontend/node_dir_ops.go
index c4ab861..97e4caa 100644
--- a/internal/fusefrontend/node_dir_ops.go
+++ b/internal/fusefrontend/node_dir_ops.go
@@ -12,11 +12,11 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
const dsStoreName = ".DS_Store"
diff --git a/internal/fusefrontend/node_helpers.go b/internal/fusefrontend/node_helpers.go
index 8d1749d..46046f1 100644
--- a/internal/fusefrontend/node_helpers.go
+++ b/internal/fusefrontend/node_helpers.go
@@ -9,8 +9,8 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "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.
diff --git a/internal/fusefrontend/node_open_create.go b/internal/fusefrontend/node_open_create.go
index 6385bc1..eb45fb4 100644
--- a/internal/fusefrontend/node_open_create.go
+++ b/internal/fusefrontend/node_open_create.go
@@ -7,9 +7,9 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// Open - FUSE call. Open already-existing file.
diff --git a/internal/fusefrontend/node_prepare_syscall.go b/internal/fusefrontend/node_prepare_syscall.go
index 8a0e75c..2a4d6ab 100644
--- a/internal/fusefrontend/node_prepare_syscall.go
+++ b/internal/fusefrontend/node_prepare_syscall.go
@@ -4,11 +4,11 @@ import (
"sync/atomic"
"syscall"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
"github.com/hanwen/go-fuse/v2/fs"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
// prepareAtSyscall returns a (dirfd, cName) pair that can be used
diff --git a/internal/fusefrontend/node_xattr.go b/internal/fusefrontend/node_xattr.go
index ceb10f1..d5d8c5b 100644
--- a/internal/fusefrontend/node_xattr.go
+++ b/internal/fusefrontend/node_xattr.go
@@ -9,7 +9,7 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// -1 as uint32
@@ -24,7 +24,7 @@ var xattrNameIV = []byte("xattr_name_iv_xx")
var xattrStorePrefix = "user.gocryptfs."
// We get one read of this xattr for each write -
-// see https://github.com/rfjakob/gocryptfs/issues/515 for details.
+// see https://github.com/rfjakob/gocryptfs/v2/issues/515 for details.
var xattrCapability = "security.capability"
// isAcl returns true if the attribute name is for storing ACLs
@@ -41,7 +41,7 @@ func (n *Node) Getxattr(ctx context.Context, attr string, dest []byte) (uint32,
rn := n.rootNode()
// If we are not mounted with -suid, reading the capability xattr does not
// make a lot of sense, so reject the request and gain a massive speedup.
- // See https://github.com/rfjakob/gocryptfs/issues/515 .
+ // See https://github.com/rfjakob/gocryptfs/v2/issues/515 .
if !rn.args.Suid && attr == xattrCapability {
// Returning EOPNOTSUPP is what we did till
// ca9e912a28b901387e1dbb85f6c531119f2d5ef2 "fusefrontend: drop xattr user namespace restriction"
diff --git a/internal/fusefrontend/node_xattr_darwin.go b/internal/fusefrontend/node_xattr_darwin.go
index 31ba653..8c8a153 100644
--- a/internal/fusefrontend/node_xattr_darwin.go
+++ b/internal/fusefrontend/node_xattr_darwin.go
@@ -8,7 +8,7 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
// On Darwin we have to unset XATTR_NOSECURITY 0x0008
diff --git a/internal/fusefrontend/node_xattr_linux.go b/internal/fusefrontend/node_xattr_linux.go
index 212d4e1..4a356a5 100644
--- a/internal/fusefrontend/node_xattr_linux.go
+++ b/internal/fusefrontend/node_xattr_linux.go
@@ -9,7 +9,7 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
)
func filterXattrSetFlags(flags int) int {
diff --git a/internal/fusefrontend/prepare_syscall_test.go b/internal/fusefrontend/prepare_syscall_test.go
index 693f62a..acddaf3 100644
--- a/internal/fusefrontend/prepare_syscall_test.go
+++ b/internal/fusefrontend/prepare_syscall_test.go
@@ -9,8 +9,8 @@ import (
"github.com/hanwen/go-fuse/v2/fuse"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/tests/test_helpers"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
func TestPrepareAtSyscall(t *testing.T) {
diff --git a/internal/fusefrontend/root_node.go b/internal/fusefrontend/root_node.go
index a2de953..34b084b 100644
--- a/internal/fusefrontend/root_node.go
+++ b/internal/fusefrontend/root_node.go
@@ -7,13 +7,13 @@ import (
"syscall"
"time"
- "github.com/rfjakob/gocryptfs/internal/configfile"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/inomap"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
- "github.com/rfjakob/gocryptfs/internal/serialize_reads"
- "github.com/rfjakob/gocryptfs/internal/syscallcompat"
- "github.com/rfjakob/gocryptfs/internal/tlog"
+ "github.com/rfjakob/gocryptfs/v2/internal/configfile"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/inomap"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/serialize_reads"
+ "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
+ "github.com/rfjakob/gocryptfs/v2/internal/tlog"
)
// RootNode is the root of the filesystem tree of Nodes.
diff --git a/internal/fusefrontend/xattr_unit_test.go b/internal/fusefrontend/xattr_unit_test.go
index 397e3ef..7449d24 100644
--- a/internal/fusefrontend/xattr_unit_test.go
+++ b/internal/fusefrontend/xattr_unit_test.go
@@ -9,9 +9,9 @@ import (
"github.com/hanwen/go-fuse/v2/fs"
- "github.com/rfjakob/gocryptfs/internal/contentenc"
- "github.com/rfjakob/gocryptfs/internal/cryptocore"
- "github.com/rfjakob/gocryptfs/internal/nametransform"
+ "github.com/rfjakob/gocryptfs/v2/internal/contentenc"
+ "github.com/rfjakob/gocryptfs/v2/internal/cryptocore"
+ "github.com/rfjakob/gocryptfs/v2/internal/nametransform"
)
func newTestFS(args Args) *RootNode {