From 84344834c4fb49c2eb484bcc43d24a2522b1b5c1 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sat, 11 Jul 2020 19:44:45 +0200
Subject: v2api: remove OpenatUserCtx, MknodatUserCtx helpers

Instead, use the new toFuseCtx() function introduced
in an earlier commit.
---
 internal/syscallcompat/sys_linux.go | 29 -----------------------------
 1 file changed, 29 deletions(-)

(limited to 'internal/syscallcompat')

diff --git a/internal/syscallcompat/sys_linux.go b/internal/syscallcompat/sys_linux.go
index 5a23084..42e9da6 100644
--- a/internal/syscallcompat/sys_linux.go
+++ b/internal/syscallcompat/sys_linux.go
@@ -2,7 +2,6 @@
 package syscallcompat
 
 import (
-	"context"
 	"fmt"
 	"io/ioutil"
 	"runtime"
@@ -89,20 +88,6 @@ func getSupplementaryGroups(pid uint32) (gids []int) {
 	return nil
 }
 
-// OpenatUserCtx is a tries to extract a fuse.Context from the generic ctx and
-// calls OpenatUser.
-func OpenatUserCtx(dirfd int, path string, flags int, mode uint32, ctx context.Context) (fd int, err error) {
-	var ctx2 *fuse.Context
-	if ctx != nil {
-		if caller, ok := fuse.FromContext(ctx); ok {
-			ctx2 = &fuse.Context{
-				Caller: *caller,
-			}
-		}
-	}
-	return OpenatUser(dirfd, path, flags, mode, ctx2)
-}
-
 // OpenatUser runs the Openat syscall in the context of a different user.
 func OpenatUser(dirfd int, path string, flags int, mode uint32, context *fuse.Context) (fd int, err error) {
 	if context != nil {
@@ -136,20 +121,6 @@ func Mknodat(dirfd int, path string, mode uint32, dev int) (err error) {
 	return syscall.Mknodat(dirfd, path, mode, dev)
 }
 
-// MknodatUserCtx is a tries to extract a fuse.Context from the generic ctx and
-// calls OpenatUser.
-func MknodatUserCtx(dirfd int, path string, mode uint32, dev int, ctx context.Context) (err error) {
-	var ctx2 *fuse.Context
-	if ctx != nil {
-		if caller, ok := fuse.FromContext(ctx); ok {
-			ctx2 = &fuse.Context{
-				Caller: *caller,
-			}
-		}
-	}
-	return MknodatUser(dirfd, path, mode, dev, ctx2)
-}
-
 // MknodatUser runs the Mknodat syscall in the context of a different user.
 func MknodatUser(dirfd int, path string, mode uint32, dev int, context *fuse.Context) (err error) {
 	if context != nil {
-- 
cgit v1.2.3