rename: Move some files around

2 files changed, 66 insertions, 57 deletions

diff --git a/lib/btrfsprogs/btrfsutil/csums.go b/lib/btrfsprogs/btrfsutil/csums.go
new file mode 100644
index 0000000..aad1b45
--- /dev/null
+++ b/lib/btrfsprogs/btrfsutil/csums.go
@@ -0,0 +1,66 @@
+// 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/btrfssum"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
+)
+
+func ChecksumLogical(fs btrfs.Trees, alg btrfssum.CSumType, laddr btrfsvol.LogicalAddr) (btrfssum.CSum, error) {
+	var dat [btrfsitem.CSumBlockSize]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 [btrfsitem.CSumBlockSize]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.Trees, alg btrfssum.CSumType, laddr btrfsvol.LogicalAddr) (map[btrfsvol.LogicalAddr]btrfssum.CSum, error) {
+	item, err := fs.TreeSearch(btrfs.CSUM_TREE_OBJECTID, func(key btrfs.Key, size uint32) int {
+		itemBeg := btrfsvol.LogicalAddr(key.ObjectID)
+		numSums := int64(size) / int64(alg.Size())
+		itemEnd := itemBeg + btrfsvol.LogicalAddr(numSums*btrfsitem.CSumBlockSize)
+		switch {
+		case itemEnd <= laddr:
+			return 1
+		case laddr < itemBeg:
+			return -1
+		default:
+			return 0
+		}
+	})
+	if err != nil {
+		return nil, err
+	}
+	body, ok := item.Body.(btrfsitem.ExtentCSum)
+	if !ok {
+		return nil, fmt.Errorf("item body is %T not ExtentCSum", item.Body)
+	}
+	ret := make(map[btrfsvol.LogicalAddr]btrfssum.CSum, len(body.Sums))
+	for i, sum := range body.Sums {
+		ret[btrfsvol.LogicalAddr(item.Key.ObjectID)+(btrfsvol.LogicalAddr(i)*btrfsitem.CSumBlockSize)] = sum
+	}
+	return ret, nil
+}
diff --git a/lib/btrfsprogs/btrfsutil/scan.go b/lib/btrfsprogs/btrfsutil/scan.go
deleted file mode 100644
index d5d3d8d..0000000
--- a/lib/btrfsprogs/btrfsutil/scan.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (C) 2022  Luke Shumaker <lukeshu@lukeshu.com>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package btrfsutil
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
-	"git.lukeshu.com/btrfs-progs-ng/lib/diskio"
-	"git.lukeshu.com/btrfs-progs-ng/lib/slices"
-)
-
-// ScanForNodes mimics btrfs-progs
-// cmds/rescue-chunk-recover.c:scan_one_device(), except rather than
-// doing something itself when it finds a node, it simply calls a
-// callback function.
-func ScanForNodes(ctx context.Context, dev *btrfs.Device, sb btrfs.Superblock, fn func(*diskio.Ref[btrfsvol.PhysicalAddr, btrfs.Node], error), prog func(btrfsvol.PhysicalAddr)) error {
-	devSize := dev.Size()
-
-	if sb.NodeSize < sb.SectorSize {
-		return fmt.Errorf("node_size(%v) < sector_size(%v)",
-			sb.NodeSize, sb.SectorSize)
-	}
-
-	for pos := btrfsvol.PhysicalAddr(0); pos+btrfsvol.PhysicalAddr(sb.NodeSize) < devSize; pos += btrfsvol.PhysicalAddr(sb.SectorSize) {
-		if ctx.Err() != nil {
-			return ctx.Err()
-		}
-		if slices.Contains(pos, btrfs.SuperblockAddrs) {
-			//fmt.Printf("sector@%v is a superblock\n", pos)
-			continue
-		}
-
-		if prog != nil {
-			prog(pos)
-		}
-
-		nodeRef, err := btrfs.ReadNode[btrfsvol.PhysicalAddr](dev, sb, pos, nil)
-		if err != nil && errors.Is(err, btrfs.ErrNotANode) {
-			continue
-		}
-		fn(nodeRef, err)
-
-		pos += btrfsvol.PhysicalAddr(sb.NodeSize) - btrfsvol.PhysicalAddr(sb.SectorSize)
-	}
-
-	if prog != nil {
-		prog(devSize)
-	}
-
-	return nil
-}