diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2022-07-13 21:10:10 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2022-07-13 21:51:12 -0600 |
| commit | 166e51d3a6f81834cc89aec36015f05f350be31e (patch) | |
| tree | 122745341f3431b2220448d7d71965cd3e84aa97 /cmd | |
| parent | 296e9fc0f8812ce0c5684ff99f84e80eef07cd4c (diff) | |
Fix package names/imports
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/btrfs-fsck/pass1.go | 6 | ||||
| -rw-r--r-- | cmd/btrfs-fsck/pass2.go | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cmd/btrfs-fsck/pass1.go b/cmd/btrfs-fsck/pass1.go index a625193..4defd02 100644 --- a/cmd/btrfs-fsck/pass1.go +++ b/cmd/btrfs-fsck/pass1.go @@ -14,7 +14,7 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsutil" - "git.lukeshu.com/btrfs-progs-ng/lib/util" + "git.lukeshu.com/btrfs-progs-ng/lib/diskio" ) func pass1(ctx context.Context, fs *btrfs.FS, superblock *btrfs.Superblock) (map[btrfsvol.LogicalAddr]struct{}, error) { @@ -24,7 +24,7 @@ func pass1(ctx context.Context, fs *btrfs.FS, superblock *btrfs.Superblock) (map visitedNodes := make(map[btrfsvol.LogicalAddr]struct{}) btrfsutil.WalkAllTrees(ctx, fs, btrfsutil.WalkAllTreesHandler{ TreeWalkHandler: btrfs.TreeWalkHandler{ - Node: func(path btrfs.TreePath, node *util.Ref[btrfsvol.LogicalAddr, btrfs.Node]) error { + Node: func(path btrfs.TreePath, node *diskio.Ref[btrfsvol.LogicalAddr, btrfs.Node]) error { visitedNodes[node.Addr] = struct{}{} return nil }, @@ -70,7 +70,7 @@ func pass1WriteReconstructedChunks(ctx context.Context, fs *btrfs.FS) { // store that node at the root node of the chunk tree. This // isn't true in general, but it's true of my particular // filesystem. - reconstructedNode := &util.Ref[btrfsvol.LogicalAddr, btrfs.Node]{ + reconstructedNode := &diskio.Ref[btrfsvol.LogicalAddr, btrfs.Node]{ File: fs, Addr: superblock.ChunkTree, Data: btrfs.Node{ diff --git a/cmd/btrfs-fsck/pass2.go b/cmd/btrfs-fsck/pass2.go index ef55d93..e71cd84 100644 --- a/cmd/btrfs-fsck/pass2.go +++ b/cmd/btrfs-fsck/pass2.go @@ -11,7 +11,7 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol" "git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsutil" - "git.lukeshu.com/btrfs-progs-ng/lib/util" + "git.lukeshu.com/btrfs-progs-ng/lib/diskio" ) func pass2(ctx context.Context, fs *btrfs.FS, foundNodes map[btrfsvol.LogicalAddr]struct{}) { @@ -20,7 +20,7 @@ func pass2(ctx context.Context, fs *btrfs.FS, foundNodes map[btrfsvol.LogicalAdd visitedNodes := make(map[btrfsvol.LogicalAddr]struct{}) btrfsutil.WalkAllTrees(ctx, fs, btrfsutil.WalkAllTreesHandler{ TreeWalkHandler: btrfs.TreeWalkHandler{ - Node: func(path btrfs.TreePath, node *util.Ref[btrfsvol.LogicalAddr, btrfs.Node]) error { + Node: func(path btrfs.TreePath, node *diskio.Ref[btrfsvol.LogicalAddr, btrfs.Node]) error { visitedNodes[node.Addr] = struct{}{} return nil }, @@ -44,7 +44,7 @@ func pass2(ctx context.Context, fs *btrfs.FS, foundNodes map[btrfsvol.LogicalAdd /* for potentialRoot := range orphanedRoots { if err := fs.TreeWalk(potentialRoot, btrfs.TreeWalkHandler{ - Node: func(path btrfs.TreePath, _ *util.Ref[btrfsvol.LogicalAddr, btrfs.Node], _ error) error { + Node: func(path btrfs.TreePath, _ *diskio.Ref[btrfsvol.LogicalAddr, btrfs.Node], _ error) error { nodeAddr := path[len(path)-1].NodeAddr if nodeAddr != potentialRoot { delete(orphanedRoots, nodeAddr) @@ -61,7 +61,7 @@ func pass2(ctx context.Context, fs *btrfs.FS, foundNodes map[btrfsvol.LogicalAdd } } - for _, node := range util.SortedMapKeys(orphanedRoots) { + for _, node := range maps.SortedKeys(orphanedRoots) { fmt.Printf("Pass 2: orphaned root: %v\n", node) } */ |