Move the remaining former-generic.go parts out of lib/util/

4 files changed, 17 insertions, 12 deletions

diff --git a/lib/btrfsprogs/btrfsinspect/mount.go b/lib/btrfsprogs/btrfsinspect/mount.go
index c171ed3..c882c65 100644
--- a/lib/btrfsprogs/btrfsinspect/mount.go
+++ b/lib/btrfsprogs/btrfsinspect/mount.go
@@ -24,8 +24,10 @@ import (
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsutil"
+	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
 	"git.lukeshu.com/btrfs-progs-ng/lib/linux"
-	"git.lukeshu.com/btrfs-progs-ng/lib/util"
+	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
+	"git.lukeshu.com/btrfs-progs-ng/lib/slices"
 )
 
 func MountRO(ctx context.Context, fs *btrfs.FS, mountpoint string) error {
@@ -34,7 +36,7 @@ func MountRO(ctx context.Context, fs *btrfs.FS, mountpoint string) error {
 		return errors.New("no devices")
 	}
 
-	deviceName := pvs[util.SortedMapKeys(pvs)[0]].Name()
+	deviceName := pvs[maps.SortedKeys(pvs)[0]].Name()
 	if abs, err := filepath.Abs(deviceName); err == nil {
 		deviceName = abs
 	}
@@ -106,8 +108,8 @@ type subvolume struct {
 
 	fuseutil.NotImplementedFileSystem
 	lastHandle  uint64
-	dirHandles  util.SyncMap[fuseops.HandleID, *dirState]
-	fileHandles util.SyncMap[fuseops.HandleID, *fileState]
+	dirHandles  containers.SyncMap[fuseops.HandleID, *dirState]
+	fileHandles containers.SyncMap[fuseops.HandleID, *fileState]
 
 	subvolMu sync.Mutex
 	subvols  map[string]struct{}
@@ -155,7 +157,7 @@ func (sv *subvolume) LoadDir(inode btrfs.ObjID) (val *btrfs.Dir, err error) {
 	val, err = sv.Subvolume.LoadDir(inode)
 	if val != nil {
 		haveSubvolumes := false
-		for _, index := range util.SortedMapKeys(val.ChildrenByIndex) {
+		for _, index := range maps.SortedKeys(val.ChildrenByIndex) {
 			entry := val.ChildrenByIndex[index]
 			if entry.Location.ItemType == btrfsitem.ROOT_ITEM_KEY {
 				haveSubvolumes = true
@@ -168,7 +170,7 @@ func (sv *subvolume) LoadDir(inode btrfs.ObjID) (val *btrfs.Dir, err error) {
 				return
 			}
 			sv.subvolMu.Lock()
-			for _, index := range util.SortedMapKeys(val.ChildrenByIndex) {
+			for _, index := range maps.SortedKeys(val.ChildrenByIndex) {
 				entry := val.ChildrenByIndex[index]
 				if entry.Location.ItemType != btrfsitem.ROOT_ITEM_KEY {
 					continue
@@ -317,7 +319,7 @@ func (sv *subvolume) ReadDir(_ context.Context, op *fuseops.ReadDirOp) error {
 		return syscall.EBADF
 	}
 	origOffset := op.Offset
-	for _, index := range util.SortedMapKeys(state.Dir.ChildrenByIndex) {
+	for _, index := range maps.SortedKeys(state.Dir.ChildrenByIndex) {
 		if index < uint64(origOffset) {
 			continue
 		}
@@ -373,7 +375,7 @@ func (sv *subvolume) ReadFile(_ context.Context, op *fuseops.ReadFileOp) error {
 
 	var dat []byte
 	if op.Dst != nil {
-		size := util.Min(int64(len(op.Dst)), op.Size)
+		size := slices.Min(int64(len(op.Dst)), op.Size)
 		dat = op.Dst[:size]
 	} else {
 		dat = make([]byte, op.Size)
diff --git a/lib/btrfsprogs/btrfsinspect/print_tree.go b/lib/btrfsprogs/btrfsinspect/print_tree.go
index 5d3b4ef..8aef98a 100644
--- a/lib/btrfsprogs/btrfsinspect/print_tree.go
+++ b/lib/btrfsprogs/btrfsinspect/print_tree.go
@@ -17,6 +17,7 @@ import (
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+	"git.lukeshu.com/btrfs-progs-ng/lib/slices"
 	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
@@ -206,7 +207,7 @@ func printTree(ctx context.Context, out io.Writer, fs *btrfs.FS, treeID btrfs.Ob
 				itemSize := btrfsvol.AddrDelta(len(body.Sums)) * sectorSize
 				fmt.Fprintf(out, "\t\trange start %d end %d length %d",
 					start, start.Add(itemSize), itemSize)
-				sumsPerLine := util.Max(1, len(btrfssum.CSum{})/body.ChecksumSize/2)
+				sumsPerLine := slices.Max(1, len(btrfssum.CSum{})/body.ChecksumSize/2)
 
 				pos := start
 				for i, sum := range body.Sums {
diff --git a/lib/btrfsprogs/btrfsinspect/recoverchunks.go b/lib/btrfsprogs/btrfsinspect/recoverchunks.go
index 9f97b45..4f01d0a 100644
--- a/lib/btrfsprogs/btrfsinspect/recoverchunks.go
+++ b/lib/btrfsprogs/btrfsinspect/recoverchunks.go
@@ -14,6 +14,7 @@ import (
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
 	"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/maps"
 	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
@@ -79,7 +80,7 @@ func (found ScanOneDevResult) AddToLV(ctx context.Context, fs *btrfs.FS, dev *bt
 	// nodes will be subsumed by other things.)
 	//
 	// Sort them so that progress numbers are predictable.
-	for _, laddr := range util.SortedMapKeys(found.FoundNodes) {
+	for _, laddr := range maps.SortedKeys(found.FoundNodes) {
 		for _, paddr := range found.FoundNodes[laddr] {
 			if err := fs.LV.AddMapping(btrfsvol.Mapping{
 				LAddr: laddr,
@@ -118,7 +119,7 @@ func (found ScanOneDevResult) AddToLV(ctx context.Context, fs *btrfs.FS, dev *bt
 			Flags: bg.BG.Flags,
 		}] = struct{}{}
 	}
-	bgsOrdered := util.MapKeys(bgsSet)
+	bgsOrdered := maps.Keys(bgsSet)
 	sort.Slice(bgsOrdered, func(i, j int) bool {
 		return bgsOrdered[i].LAddr < bgsOrdered[j].LAddr
 	})
diff --git a/lib/btrfsprogs/btrfsutil/scan.go b/lib/btrfsprogs/btrfsutil/scan.go
index 02d4124..7189e99 100644
--- a/lib/btrfsprogs/btrfsutil/scan.go
+++ b/lib/btrfsprogs/btrfsutil/scan.go
@@ -11,6 +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/slices"
 	"git.lukeshu.com/btrfs-progs-ng/lib/util"
 )
 
@@ -33,7 +34,7 @@ func ScanForNodes(ctx context.Context, dev *btrfs.Device, sb btrfs.Superblock, f
 		if ctx.Err() != nil {
 			return ctx.Err()
 		}
-		if util.InSlice(pos, btrfs.SuperblockAddrs) {
+		if slices.Contains(pos, btrfs.SuperblockAddrs) {
 			//fmt.Printf("sector@%v is a superblock\n", pos)
 			continue
 		}