Skip to content

Commit

Permalink
fuse: remove unused context parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelEischer committed Aug 26, 2022
1 parent a0c1ae9 commit dd7cd5b
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions internal/fuse/dir.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func cleanupNodeName(name string) string {
return filepath.Base(name)
}

func newDir(ctx context.Context, root *Root, inode, parentInode uint64, node *restic.Node) (*dir, error) {
func newDir(root *Root, inode, parentInode uint64, node *restic.Node) (*dir, error) {
debug.Log("new dir for %v (%v)", node.Name, node.Subtree)

return &dir{
Expand Down Expand Up @@ -74,7 +74,7 @@ func replaceSpecialNodes(ctx context.Context, repo restic.Repository, node *rest
return tree.Nodes, nil
}

func newDirFromSnapshot(ctx context.Context, root *Root, inode uint64, snapshot *restic.Snapshot) (*dir, error) {
func newDirFromSnapshot(root *Root, inode uint64, snapshot *restic.Snapshot) (*dir, error) {
debug.Log("new dir for snapshot %v (%v)", snapshot.ID(), snapshot.Tree)
return &dir{
root: root,
Expand Down Expand Up @@ -206,13 +206,13 @@ func (d *dir) Lookup(ctx context.Context, name string) (fs.Node, error) {
}
switch node.Type {
case "dir":
return newDir(ctx, d.root, fs.GenerateDynamicInode(d.inode, name), d.inode, node)
return newDir(d.root, fs.GenerateDynamicInode(d.inode, name), d.inode, node)
case "file":
return newFile(ctx, d.root, fs.GenerateDynamicInode(d.inode, name), node)
return newFile(d.root, fs.GenerateDynamicInode(d.inode, name), node)
case "symlink":
return newLink(ctx, d.root, fs.GenerateDynamicInode(d.inode, name), node)
return newLink(d.root, fs.GenerateDynamicInode(d.inode, name), node)
case "dev", "chardev", "fifo", "socket":
return newOther(ctx, d.root, fs.GenerateDynamicInode(d.inode, name), node)
return newOther(d.root, fs.GenerateDynamicInode(d.inode, name), node)
default:
debug.Log(" node %v has unknown type %v", name, node.Type)
return nil, fuse.ENOENT
Expand Down
2 changes: 1 addition & 1 deletion internal/fuse/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type openFile struct {
cumsize []uint64
}

func newFile(ctx context.Context, root *Root, inode uint64, node *restic.Node) (fusefile *file, err error) {
func newFile(root *Root, inode uint64, node *restic.Node) (fusefile *file, err error) {
debug.Log("create new file for %v with %d blobs", node.Name, len(node.Content))
return &file{
inode: inode,
Expand Down
4 changes: 2 additions & 2 deletions internal/fuse/fuse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func TestFuseFile(t *testing.T) {
root := &Root{repo: repo, blobCache: bloblru.New(blobCacheSize)}

inode := fs.GenerateDynamicInode(1, "foo")
f, err := newFile(context.TODO(), root, inode, node)
f, err := newFile(root, inode, node)
rtest.OK(t, err)
of, err := f.Open(context.TODO(), nil, nil)
rtest.OK(t, err)
Expand Down Expand Up @@ -163,7 +163,7 @@ func TestFuseDir(t *testing.T) {
}
parentInode := fs.GenerateDynamicInode(0, "parent")
inode := fs.GenerateDynamicInode(1, "foo")
d, err := newDir(context.TODO(), root, inode, parentInode, node)
d, err := newDir(root, inode, parentInode, node)
rtest.OK(t, err)

// don't open the directory as that would require setting up a proper tree blob
Expand Down
2 changes: 1 addition & 1 deletion internal/fuse/link.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type link struct {
inode uint64
}

func newLink(ctx context.Context, root *Root, inode uint64, node *restic.Node) (*link, error) {
func newLink(root *Root, inode uint64, node *restic.Node) (*link, error) {
return &link{root: root, inode: inode, node: node}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion internal/fuse/other.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type other struct {
inode uint64
}

func newOther(ctx context.Context, root *Root, inode uint64, node *restic.Node) (*other, error) {
func newOther(root *Root, inode uint64, node *restic.Node) (*other, error) {
return &other{root: root, inode: inode, node: node}, nil
}

Expand Down
6 changes: 3 additions & 3 deletions internal/fuse/snapshots_dir.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ func (d *SnapshotsDir) Lookup(ctx context.Context, name string) (fs.Node, error)
entry := meta.names[name]
if entry != nil {
if entry.linkTarget != "" {
return newSnapshotLink(ctx, d.root, fs.GenerateDynamicInode(d.inode, name), entry.linkTarget, entry.snapshot)
return newSnapshotLink(d.root, fs.GenerateDynamicInode(d.inode, name), entry.linkTarget, entry.snapshot)
} else if entry.snapshot != nil {
return newDirFromSnapshot(ctx, d.root, fs.GenerateDynamicInode(d.inode, name), entry.snapshot)
return newDirFromSnapshot(d.root, fs.GenerateDynamicInode(d.inode, name), entry.snapshot)
} else {
return NewSnapshotsDir(d.root, fs.GenerateDynamicInode(d.inode, name), d.inode, d.dirStruct, d.prefix+"/"+name), nil
}
Expand All @@ -127,7 +127,7 @@ type snapshotLink struct {
var _ = fs.NodeReadlinker(&snapshotLink{})

// newSnapshotLink
func newSnapshotLink(ctx context.Context, root *Root, inode uint64, target string, snapshot *restic.Snapshot) (*snapshotLink, error) {
func newSnapshotLink(root *Root, inode uint64, target string, snapshot *restic.Snapshot) (*snapshotLink, error) {
return &snapshotLink{root: root, inode: inode, target: target, snapshot: snapshot}, nil
}

Expand Down

0 comments on commit dd7cd5b

Please sign in to comment.