Age | Commit message (Collapse) | Author |
|
|
|
|
|
- Go ahead and have .NodeExpectations fail closed. It shouldn't make a
difference at this point, but being stricter here is better.
- Add a sanity check that the walker hasn't disagreed from the nodeIndex.
At the leafs, the sanity check on items.Load should detect this, but
let's detect it earlier to make things easier to debug.
|
|
|
|
|
|
|
|
- rebuildtrees: Use .ForrestLookup instead of .RebuiltTree where possible
- btrfsutil: noopRebuiltForrestCallbacks: Use only the generic
btrfstree.Forrest API
- btrfsutil: RebuiltForrest, RebuiltTree: Avoid unnecessarily
reaching into forrest.inner
- btrfsutil: RebuiltTree: Drop the .ReadItem() method; it duplicates
.TreeLookup without benefit.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The implication being that I plan on adding more members to the struct.
|
|
|
|
|
|
- Add a runtime-check to Progress to notice if we deadlocked or
forgot to call .Done().
- Add a runtime-check to Progress.Done() to panic if .Set() was never
called (instead of the old behavior of deadlocking).
- grep: Use `defer` when possible, to help remember to call .Done().
- grep: Always either call .Set() right away, or right before calling
.Done().
|
|
belong to
- nodeInfo → oldRebuiltNodeInfo (old_rebuilt_forrest.go)
- itemStats → rebuiltItemStats (rebuilt_tree.go)
- rootStats → rebuiltRootStats (rebuilt_tree.go)
- nodeScanner → nodeLister (listnodes.go)
- nodeStats → nodeListStats (listnodes.go)
- scanStats → devScanStats (scan.go)
|
|
|
|
rebuilt_tree.go
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#!/bin/bash
set -e
git ls-files :*.go :!tools/| while read -r file; do
pkgname=${file%/*.go}
pkgname=${pkgname##*/}
if [[ "$pkgname" == btrfs-rec ]]; then
pkgname=main
fi
sed -i "s/^package [^_]*/package ${pkgname}/" "$file"
done
# btrfsutil ####################################################################
gofmt -w -r 'rebuildnodes -> rebuildtrees' cmd lib
gofmt -w -r 'btrees -> btrfsutil' cmd lib
gofmt -w -r 'keyio -> btrfsutil' cmd lib
sed -i 's/func New/func NewGraph/' lib/btrfsutil/graph.go
gofmt -w -r 'graph.New -> btrfsutil.NewGraph' cmd lib
gofmt -w -r 'graph.Graph -> btrfsutil.Graph' cmd lib
sed -i -e '/\/graph"/d' -e 's/pkggraph\.//' lib/btrfsutil/rebuilt_forrest.go
gofmt -w -r 'btrfsutil.BrokenForrest -> BrokenForrest ' lib/btrfsutil
gofmt -w -r 'btrfsutil.Handle -> Handle ' lib/btrfsutil
gofmt -w -r 'btrfsutil.Graph -> Graph ' lib/btrfsutil
gofmt -w -r 'btrfsutil.ItemPtr -> ItemPtr ' lib/btrfsutil
gofmt -w -r 'Handle -> KeyIO' lib/btrfsutil
gofmt -w -r 'btrfsutil.Handle -> btrfsutil.KeyIO' cmd/btrfs-rec/inspect/rebuildtrees/
gofmt -w -r 'NewHandle -> NewKeyIO' cmd lib
# rebuildmappings ##############################################################
gofmt -w -r 'btrfsinspect.DumpTrees -> dumptrees.DumpTrees' cmd lib
gofmt -w -r 'btrfsinspect.MountRO -> mount.MountRO' cmd lib
gofmt -w -r 'btrfsinspect.ScanDevices -> rebuildmappings.ScanDevices' cmd lib
gofmt -w -r 'btrfsinspect.ScanDevicesResult -> rebuildmappings.ScanDevicesResult' cmd lib
gofmt -w -r 'btrfsinspect.SysExtentCSum -> rebuildmappings.SysExtentCSum' cmd lib
gofmt -w -r 'rebuildmappings.IndexAll -> IndexAll ' cmd/btrfs-rec/inspect/rebuildmappings
gofmt -w -r 'rebuildmappings.ScanDevicesResult -> ScanDevicesResult ' cmd/btrfs-rec/inspect/rebuildmappings
gofmt -w -r 'rebuildmappings.SysExtentCSum -> SysExtentCSum ' cmd/btrfs-rec/inspect/rebuildmappings
# btrfscheck ###################################################################
sed -i -e 's/func handle/func Handle/' lib/btrfscheck/graph.go
sed -i 's/handle/btrfscheck.Handle/g' cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go
gofmt -w -r 'fsErr -> FSErr ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
gofmt -w -r 'want -> Want ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
gofmt -w -r 'wantOff -> WantOff ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
gofmt -w -r 'wantDirIndex -> WantDirIndex ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
gofmt -w -r 'wantCSum -> WantCSum ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
gofmt -w -r 'wantFileExt -> WantFileExt ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
# generic imports ##############################################################
replace() {
git grep -l "$1"|xargs -r sed -i "s,$1,$2,g"
}
replace 'lib/btrfsprogs/btrfsinspect/rebuildmappings"' 'cmd/btrfs-rec/inspect/rebuildmappings"'
replace 'lib/btrfsprogs/btrfsinspect/rebuildnodes"' 'cmd/btrfs-rec/inspect/rebuildtrees"'
replace 'lib/btrfsprogs/btrfsutil"' 'lib/btrfsutil"'
goimports -w cmd lib
./tools/bin/golangci-lint run --fix ./...
And then touch-up copyright statements by hand.
|
|
|