From c9165b955861655d702059950573aaaf21101e6b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 17 Aug 2022 20:29:48 -0600 Subject: rename: Rename "ScanOneDev"→"ScanOneDevice" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/btrfs-fsck/pass1.go | 2 +- cmd/btrfs-rec/inspect_lstrees.go | 2 +- cmd/btrfs-rec/inspect_rebuildmappings.go | 2 +- cmd/btrfs-rec/inspect_rebuildnodes.go | 2 +- cmd/btrfs-rec/inspect_scanfornodes.go | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'cmd') 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 -- cgit v1.2.3-54-g00ecf