Merge pull request #678 from blinsay/upgrade-fuseutil

Upgrade jacobsa/fuse to allow unprivileged mounts on Linux
GoogleCloudPlatform · Jun 20, 2022 · 7af1ab8 · 7af1ab8
2 parents 27c5c2e + d409137
commit 7af1ab8
Show file tree

Hide file tree

Showing 98 changed files with 3,480 additions and 316 deletions.
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/jacobsa/daemonize v0.0.0-20160101105449-e460293e890f
-	github.com/jacobsa/fuse v0.0.0-20220303083136-48612565d5c8
+	github.com/jacobsa/fuse v0.0.0-20220531202254-21122235c77a
 	github.com/jacobsa/gcloud v0.0.0-20220426111934-d5f9e155f950
 	github.com/jacobsa/oglematchers v0.0.0-20150720000706-141901ea67cd
 	github.com/jacobsa/oglemock v0.0.0-20150831005832-e94d794d06ff
@@ -24,7 +24,7 @@ require (
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/urfave/cli v1.22.5
 	go.opencensus.io v0.23.0
-	golang.org/x/net v0.0.0-20220325170049-de3da57026de
+	golang.org/x/net v0.0.0-20220526153639-5463443f8c37
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
 	google.golang.org/api v0.74.0
 )
diff --git a/go.sum b/go.sum
diff --git a/internal/fs/wrappers/debug_logging.go b/internal/fs/wrappers/debug_logging.go
@@ -81,6 +81,14 @@ func (fs *debugLogging) ForgetInode(
 	return err
 }
 
+func (fs *debugLogging) BatchForget(
+	ctx context.Context,
+	op *fuseops.BatchForgetOp) error {
+	err := fs.wrapped.BatchForget(ctx, op)
+	fs.logger.Printf("BatchForget(%v): %v", op.Entries, err)
+	return err
+}
+
 func (fs *debugLogging) MkDir(
 	ctx context.Context,
 	op *fuseops.MkDirOp) error {

diff --git a/internal/fs/wrappers/error_mapping.go b/internal/fs/wrappers/error_mapping.go
@@ -137,6 +137,13 @@ func (em *errorMapping) ForgetInode(
 	return em.mapError("ForgetInode", err)
 }
 
+func (em *errorMapping) BatchForget(
+	ctx context.Context,
+	op *fuseops.BatchForgetOp) error {
+	err := em.wrapped.BatchForget(ctx, op)
+	return em.mapError("BatchForget", err)
+}
+
 func (em *errorMapping) MkDir(
 	ctx context.Context,
 	op *fuseops.MkDirOp) error {

diff --git a/internal/fs/wrappers/monitoring.go b/internal/fs/wrappers/monitoring.go
@@ -190,6 +190,15 @@ func (fs *monitoring) ForgetInode(
 	return err
 }
 
+func (fs *monitoring) BatchForget(
+	ctx context.Context,
+	op *fuseops.BatchForgetOp) error {
+	startTime := time.Now()
+	err := fs.wrapped.BatchForget(ctx, op)
+	recordOp(ctx, "BatchForget", startTime, err)
+	return err
+}
+
 func (fs *monitoring) MkDir(
 	ctx context.Context,
 	op *fuseops.MkDirOp) error {

diff --git a/vendor/github.com/jacobsa/fuse/conversions.go b/vendor/github.com/jacobsa/fuse/conversions.go
diff --git a/vendor/github.com/jacobsa/fuse/fuseops/ops.go b/vendor/github.com/jacobsa/fuse/fuseops/ops.go
diff --git a/vendor/github.com/jacobsa/fuse/fuseutil/file_system.go b/vendor/github.com/jacobsa/fuse/fuseutil/file_system.go
diff --git a/vendor/github.com/jacobsa/fuse/fuseutil/not_implemented_file_system.go b/vendor/github.com/jacobsa/fuse/fuseutil/not_implemented_file_system.go
diff --git a/vendor/github.com/jacobsa/fuse/go.mod b/vendor/github.com/jacobsa/fuse/go.mod
diff --git a/vendor/github.com/jacobsa/fuse/go.sum b/vendor/github.com/jacobsa/fuse/go.sum
diff --git a/vendor/github.com/jacobsa/fuse/internal/fusekernel/fuse_kernel.go b/vendor/github.com/jacobsa/fuse/internal/fusekernel/fuse_kernel.go
diff --git a/vendor/github.com/jacobsa/fuse/mount.go b/vendor/github.com/jacobsa/fuse/mount.go
diff --git a/vendor/github.com/jacobsa/fuse/mount_linux.go b/vendor/github.com/jacobsa/fuse/mount_linux.go
diff --git a/vendor/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go
diff --git a/vendor/golang.org/x/net/context/go17.go b/vendor/golang.org/x/net/context/go17.go
diff --git a/vendor/golang.org/x/net/context/pre_go17.go b/vendor/golang.org/x/net/context/pre_go17.go