From 7d2d4ae383e02a03dec6aa60207e3a1dfa8e79a9 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 1 Jul 2022 00:19:38 -0600 Subject: move dumb map and sort operations to util/generic.go Also, the optimization of reversing the node list in pass1 isn't relevant anymore now that I'm using rbtrees --- cmd/btrfs-fsck/pass2.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'cmd/btrfs-fsck/pass2.go') diff --git a/cmd/btrfs-fsck/pass2.go b/cmd/btrfs-fsck/pass2.go index d496d13..acea740 100644 --- a/cmd/btrfs-fsck/pass2.go +++ b/cmd/btrfs-fsck/pass2.go @@ -3,7 +3,6 @@ package main import ( "fmt" iofs "io/fs" - "sort" "lukeshu.com/btrfs-tools/pkg/btrfs" "lukeshu.com/btrfs-tools/pkg/btrfsmisc" @@ -53,14 +52,7 @@ func pass2(fs *btrfs.FS, foundNodes map[btrfs.LogicalAddr]struct{}) { } } - var orphanedRootsOrdered []btrfs.LogicalAddr - for root := range orphanedRoots { - orphanedRootsOrdered = append(orphanedRootsOrdered, root) - } - sort.Slice(orphanedRootsOrdered, func(i, j int) bool { - return orphanedRootsOrdered[i] < orphanedRootsOrdered[j] - }) - for _, node := range orphanedRootsOrdered { + for _, node := range util.SortedMapKeys(orphanedRoots) { fmt.Printf("Pass 2: orphaned root: %v\n", node) } } -- cgit v1.2.3-2-g168b