From c9165b955861655d702059950573aaaf21101e6b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 17 Aug 2022 20:29:48 -0600 Subject: =?UTF-8?q?rename:=20Rename=20"ScanOneDev"=E2=86=92"ScanOneDevice"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/btrfsprogs/btrfsinspect/recoverchunks.go | 10 +++++----- lib/btrfsprogs/btrfsinspect/scanforextents/blockgroups.go | 2 +- lib/btrfsprogs/btrfsinspect/scanforextents/scan.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/btrfsprogs') 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, -- cgit v1.2.3-2-g168b