KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

fuse: remove unused context parameter

Browse source
This commit is contained in:
Michael Eischer 2022-08-19 20:29:33 +02:00
parent a0c1ae9f90
commit dd7cd5b9b3
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal/fuse/dir.go
View file

@ -34,7 +34,7 @@ func cleanupNodeName(name string) string {
return filepath.Base(name) 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) debug.Log("new dir for %v (%v)", node.Name, node.Subtree)
return &dir{ return &dir{
@ -74,7 +74,7 @@ func replaceSpecialNodes(ctx context.Context, repo restic.Repository, node *rest
return tree.Nodes, nil 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) debug.Log("new dir for snapshot %v (%v)", snapshot.ID(), snapshot.Tree)
return &dir{ return &dir{
root: root, root: root,
@ -206,13 +206,13 @@ func (d *dir) Lookup(ctx context.Context, name string) (fs.Node, error) {
} }
switch node.Type { switch node.Type {
case "dir": 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": 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": 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": 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: default:
debug.Log(" node %v has unknown type %v", name, node.Type) debug.Log(" node %v has unknown type %v", name, node.Type)
return nil, fuse.ENOENT return nil, fuse.ENOENT

2
internal/fuse/file.go
View file

@ -36,7 +36,7 @@ type openFile struct {
cumsize []uint64 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)) debug.Log("create new file for %v with %d blobs", node.Name, len(node.Content))
return &file{ return &file{
inode: inode, inode: inode,

4
internal/fuse/fuse_test.go
View file

@ -119,7 +119,7 @@ func TestFuseFile(t *testing.T) {
root := &Root{repo: repo, blobCache: bloblru.New(blobCacheSize)} root := &Root{repo: repo, blobCache: bloblru.New(blobCacheSize)}
inode := fs.GenerateDynamicInode(1, "foo") inode := fs.GenerateDynamicInode(1, "foo")
f, err := newFile(context.TODO(), root, inode, node) f, err := newFile(root, inode, node)
rtest.OK(t, err) rtest.OK(t, err)
of, err := f.Open(context.TODO(), nil, nil) of, err := f.Open(context.TODO(), nil, nil)
rtest.OK(t, err) rtest.OK(t, err)
@ -163,7 +163,7 @@ func TestFuseDir(t *testing.T) {
} }
parentInode := fs.GenerateDynamicInode(0, "parent") parentInode := fs.GenerateDynamicInode(0, "parent")
inode := fs.GenerateDynamicInode(1, "foo") 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) rtest.OK(t, err)
// don't open the directory as that would require setting up a proper tree blob // don't open the directory as that would require setting up a proper tree blob

2
internal/fuse/link.go
View file

@ -20,7 +20,7 @@ type link struct {
inode uint64 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 return &link{root: root, inode: inode, node: node}, nil
} }

2
internal/fuse/other.go
View file

@ -16,7 +16,7 @@ type other struct {
inode uint64 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 return &other{root: root, inode: inode, node: node}, nil
} }

6
internal/fuse/snapshots_dir.go
View file

@ -105,9 +105,9 @@ func (d *SnapshotsDir) Lookup(ctx context.Context, name string) (fs.Node, error)
entry := meta.names[name] entry := meta.names[name]
if entry != nil { if entry != nil {
if entry.linkTarget != "" { 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 { } 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 { } else {
return NewSnapshotsDir(d.root, fs.GenerateDynamicInode(d.inode, name), d.inode, d.dirStruct, d.prefix+"/"+name), nil return NewSnapshotsDir(d.root, fs.GenerateDynamicInode(d.inode, name), d.inode, d.dirStruct, d.prefix+"/"+name), nil
} }
@ -127,7 +127,7 @@ type snapshotLink struct {
var _ = fs.NodeReadlinker(&snapshotLink{}) var _ = fs.NodeReadlinker(&snapshotLink{})
// newSnapshotLink // 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 return &snapshotLink{root: root, inode: inode, target: target, snapshot: snapshot}, nil
} }