2 files changed, 1 insertions, 65 deletions
diff --git a/lib/btrfsprogs/btrfsinspect/scandevices.go b/lib/btrfsprogs/btrfsinspect/scandevices.go
index c25a86f..87dcedf 100644
--- a/lib/btrfsprogs/btrfsinspect/scandevices.go
+++ b/lib/btrfsprogs/btrfsinspect/scandevices.go
@@ -21,7 +21,6 @@ import (
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfstree"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsutil"
 )
 
 type ScanDevicesResult map[btrfsvol.DeviceID]ScanOneDeviceResult
@@ -126,7 +125,7 @@ func ScanOneDevice(ctx context.Context, dev *btrfs.Device, sb btrfstree.Superblo
 		pos := btrfsvol.PhysicalAddr(i * btrfssum.BlockSize)
 		progress(pos)
 
-		sum, err := btrfsutil.ChecksumPhysical(dev, alg, pos)
+		sum, err := btrfs.ChecksumPhysical(dev, alg, pos)
 		if err != nil {
 			return result, err
 		}
diff --git a/lib/btrfsprogs/btrfsutil/csums.go b/lib/btrfsprogs/btrfsutil/csums.go
deleted file mode 100644
index a49f584..0000000
--- a/lib/btrfsprogs/btrfsutil/csums.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (C) 2022  Luke Shumaker <lukeshu@lukeshu.com>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package btrfsutil
-
-import (
-	"fmt"
-
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsprim"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfssum"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
-)
-
-func ChecksumLogical(fs *btrfs.FS, alg btrfssum.CSumType, laddr btrfsvol.LogicalAddr) (btrfssum.CSum, error) {
-	var dat [btrfssum.BlockSize]byte
-	if _, err := fs.ReadAt(dat[:], laddr); err != nil {
-		return btrfssum.CSum{}, err
-	}
-	return alg.Sum(dat[:])
-}
-
-func ChecksumPhysical(dev *btrfs.Device, alg btrfssum.CSumType, paddr btrfsvol.PhysicalAddr) (btrfssum.CSum, error) {
-	var dat [btrfssum.BlockSize]byte
-	if _, err := dev.ReadAt(dat[:], paddr); err != nil {
-		return btrfssum.CSum{}, err
-	}
-	return alg.Sum(dat[:])
-}
-
-func ChecksumQualifiedPhysical(fs *btrfs.FS, alg btrfssum.CSumType, paddr btrfsvol.QualifiedPhysicalAddr) (btrfssum.CSum, error) {
-	dev := fs.LV.PhysicalVolumes()[paddr.Dev]
-	if dev == nil {
-		return btrfssum.CSum{}, fmt.Errorf("no such device_id=%v", paddr.Dev)
-	}
-	return ChecksumPhysical(dev, alg, paddr.Addr)
-}
-
-func LookupCSum(fs *btrfs.FS, alg btrfssum.CSumType, laddr btrfsvol.LogicalAddr) (btrfssum.SumRun[btrfsvol.LogicalAddr], error) {
-	item, err := fs.TreeSearch(btrfsprim.CSUM_TREE_OBJECTID, func(key btrfsprim.Key, size uint32) int {
-		itemBeg := btrfsvol.LogicalAddr(key.ObjectID)
-		numSums := int64(size) / int64(alg.Size())
-		itemEnd := itemBeg + btrfsvol.LogicalAddr(numSums*btrfssum.BlockSize)
-		switch {
-		case itemEnd <= laddr:
-			return 1
-		case laddr < itemBeg:
-			return -1
-		default:
-			return 0
-		}
-	})
-	if err != nil {
-		return btrfssum.SumRun[btrfsvol.LogicalAddr]{}, err
-	}
-	body, ok := item.Body.(btrfsitem.ExtentCSum)
-	if !ok {
-		return btrfssum.SumRun[btrfsvol.LogicalAddr]{}, fmt.Errorf("item body is %T not ExtentCSum", item.Body)
-	}
-	return body.SumRun, nil
-}