rename: Rename "ScanOneDev"→"ScanOneDevice"

8 files changed, 14 insertions, 14 deletions

diff --git a/cmd/btrfs-fsck/pass1.go b/cmd/btrfs-fsck/pass1.go
index 9c1d845..e22cebd 100644
--- a/cmd/btrfs-fsck/pass1.go
+++ b/cmd/btrfs-fsck/pass1.go
@@ -37,7 +37,7 @@ func pass1(ctx context.Context, fs *btrfs.FS, superblock *btrfs.Superblock) (map
 	fsFoundNodes := make(map[btrfsvol.LogicalAddr]struct{})
 	for _, dev := range fs.LV.PhysicalVolumes() {
 		fmt.Printf("Pass 1: ... dev[%q] scanning for nodes...\n", dev.Name())
-		devResult, err := btrfsinspect.ScanOneDev(ctx, dev, *superblock)
+		devResult, err := btrfsinspect.ScanOneDevice(ctx, dev, *superblock)
 		if err != nil {
 			return nil, err
 		}
diff --git a/cmd/btrfs-rec/inspect_lstrees.go b/cmd/btrfs-rec/inspect_lstrees.go
index c5e78fc..06709de 100644
--- a/cmd/btrfs-rec/inspect_lstrees.go
+++ b/cmd/btrfs-rec/inspect_lstrees.go
@@ -33,7 +33,7 @@ func init() {
 			Args:  cliutil.WrapPositionalArgs(cobra.NoArgs),
 		},
 		RunE: func(fs *btrfs.FS, cmd *cobra.Command, _ []string) error {
-			var scanResults map[btrfsvol.DeviceID]btrfsinspect.ScanOneDevResult
+			var scanResults map[btrfsvol.DeviceID]btrfsinspect.ScanOneDeviceResult
 			if nodescanFilename != "" {
 				scanResultsBytes, err := os.ReadFile(nodescanFilename)
 				if err != nil {
diff --git a/cmd/btrfs-rec/inspect_rebuildmappings.go b/cmd/btrfs-rec/inspect_rebuildmappings.go
index ab767a9..5b252d5 100644
--- a/cmd/btrfs-rec/inspect_rebuildmappings.go
+++ b/cmd/btrfs-rec/inspect_rebuildmappings.go
@@ -42,7 +42,7 @@ func init() {
 			if err != nil {
 				return err
 			}
-			var scanResults map[btrfsvol.DeviceID]btrfsinspect.ScanOneDevResult
+			var scanResults map[btrfsvol.DeviceID]btrfsinspect.ScanOneDeviceResult
 			if err := json.Unmarshal(scanResultsBytes, &scanResults); err != nil {
 				return err
 			}
diff --git a/cmd/btrfs-rec/inspect_rebuildnodes.go b/cmd/btrfs-rec/inspect_rebuildnodes.go
index 1f6b643..869d51f 100644
--- a/cmd/btrfs-rec/inspect_rebuildnodes.go
+++ b/cmd/btrfs-rec/inspect_rebuildnodes.go
@@ -75,7 +75,7 @@ func init() {
 	})
 }
 
-type NodeScanResults = map[btrfsvol.DeviceID]btrfsinspect.ScanOneDevResult
+type NodeScanResults = map[btrfsvol.DeviceID]btrfsinspect.ScanOneDeviceResult
 
 func readNodeScanResults(filename string) (NodeScanResults, error) {
 	scanResultsBytes, err := os.ReadFile(filename)
diff --git a/cmd/btrfs-rec/inspect_scanfornodes.go b/cmd/btrfs-rec/inspect_scanfornodes.go
index 8ddf1fd..13f7760 100644
--- a/cmd/btrfs-rec/inspect_scanfornodes.go
+++ b/cmd/btrfs-rec/inspect_scanfornodes.go
@@ -43,7 +43,7 @@ func init() {
 			ctx := cmd.Context()
 
 			var resultsMu sync.Mutex
-			results := make(map[btrfsvol.DeviceID]btrfsinspect.ScanOneDevResult)
+			results := make(map[btrfsvol.DeviceID]btrfsinspect.ScanOneDeviceResult)
 			grp := dgroup.NewGroup(ctx, dgroup.GroupConfig{})
 			for _, dev := range fs.LV.PhysicalVolumes() {
 				dev := dev
@@ -53,7 +53,7 @@ func init() {
 						return err
 					}
 					dlog.Infof(ctx, "dev[%q] Scanning for unreachable nodes...", dev.Name())
-					devResult, err := btrfsinspect.ScanOneDev(ctx, dev, *superblock)
+					devResult, err := btrfsinspect.ScanOneDevice(ctx, dev, *superblock)
 					dlog.Infof(ctx, "dev[%q] Finished scanning", dev.Name())
 					resultsMu.Lock()
 					results[superblock.DevItem.DevID] = devResult
diff --git a/lib/btrfsprogs/btrfsinspect/recoverchunks.go b/lib/btrfsprogs/btrfsinspect/recoverchunks.go
index 012049c..b3abf75 100644
--- a/lib/btrfsprogs/btrfsinspect/recoverchunks.go
+++ b/lib/btrfsprogs/btrfsinspect/recoverchunks.go
@@ -19,7 +19,7 @@ import (
 	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
 )
 
-type ScanOneDevResult struct {
+type ScanOneDeviceResult struct {
 	FoundNodes       map[btrfsvol.LogicalAddr][]btrfsvol.PhysicalAddr
 	FoundChunks      []btrfs.SysChunk
 	FoundBlockGroups []SysBlockGroup
@@ -36,7 +36,7 @@ type SysDevExtent struct {
 	DevExt btrfsitem.DevExtent
 }
 
-func (found ScanOneDevResult) AddToLV(ctx context.Context, fs *btrfs.FS, dev *btrfs.Device) {
+func (found ScanOneDeviceResult) AddToLV(ctx context.Context, fs *btrfs.FS, dev *btrfs.Device) {
 	sb, _ := dev.Superblock()
 
 	total := len(found.FoundChunks) + len(found.FoundDevExtents)
@@ -149,10 +149,10 @@ func (found ScanOneDevResult) AddToLV(ctx context.Context, fs *btrfs.FS, dev *bt
 	}
 }
 
-// ScanOneDev mostly mimics btrfs-progs
+// ScanOneDevice mostly mimics btrfs-progs
 // cmds/rescue-chunk-recover.c:scan_one_device().
-func ScanOneDev(ctx context.Context, dev *btrfs.Device, superblock btrfs.Superblock) (ScanOneDevResult, error) {
-	result := ScanOneDevResult{
+func ScanOneDevice(ctx context.Context, dev *btrfs.Device, superblock btrfs.Superblock) (ScanOneDeviceResult, error) {
+	result := ScanOneDeviceResult{
 		FoundNodes: make(map[btrfsvol.LogicalAddr][]btrfsvol.PhysicalAddr),
 	}
 
diff --git a/lib/btrfsprogs/btrfsinspect/scanforextents/blockgroups.go b/lib/btrfsprogs/btrfsinspect/scanforextents/blockgroups.go
index 64ec8c3..d8e8844 100644
--- a/lib/btrfsprogs/btrfsinspect/scanforextents/blockgroups.go
+++ b/lib/btrfsprogs/btrfsinspect/scanforextents/blockgroups.go
@@ -16,7 +16,7 @@ import (
 	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
 )
 
-type NodeScanResults = map[btrfsvol.DeviceID]btrfsinspect.ScanOneDevResult
+type NodeScanResults = map[btrfsvol.DeviceID]btrfsinspect.ScanOneDeviceResult
 
 type BlockGroup struct {
 	LAddr btrfsvol.LogicalAddr
diff --git a/lib/btrfsprogs/btrfsinspect/scanforextents/scan.go b/lib/btrfsprogs/btrfsinspect/scanforextents/scan.go
index 9ccde7c..8ea3113 100644
--- a/lib/btrfsprogs/btrfsinspect/scanforextents/scan.go
+++ b/lib/btrfsprogs/btrfsinspect/scanforextents/scan.go
@@ -141,7 +141,7 @@ func ScanForExtents(ctx context.Context, fs *btrfs.FS, blockgroups map[btrfsvol.
 	}
 	gaps := ListPhysicalGaps(fs)
 	for _, devID := range maps.SortedKeys(gaps) {
-		if err := newMappings.ScanOneDev(ctx,
+		if err := newMappings.ScanOneDevice(ctx,
 			devID, devs[devID].Name(),
 			gaps[devID],
 		); err != nil {
@@ -235,7 +235,7 @@ func (em *ExtentMappings) addMapping(sum ShortSum, mapping btrfsvol.Mapping) {
 	em.OutSum2mappings[sum] = append(em.OutSum2mappings[sum], interned)
 }
 
-func (em *ExtentMappings) ScanOneDev(
+func (em *ExtentMappings) ScanOneDevice(
 	ctx context.Context,
 	devID btrfsvol.DeviceID, devName string,
 	gaps []PhysicalGap,