RepoMirrors/btrfs
1
0
Fork 1
mirror of https://github.com/dennwc/btrfs synced 2025-02-08 23:56:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

send: recursive best parent search

Browse Source
This commit is contained in:
Denys Smirnov 2017-01-10 16:30:47 +02:00
parent cf180d91dc
commit 532eaaa4b7
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
send.go
View File

@ -194,7 +194,7 @@ func readRootItem(mnt *os.File, rootID objectID) (*rootItem, error) {
func getParent(mnt *os.File, rootID objectID) (*SubvolInfo, error) { func getParent(mnt *os.File, rootID objectID) (*SubvolInfo, error) {
st, err := subvolSearchByRootID(mnt, rootID, "") st, err := subvolSearchByRootID(mnt, rootID, "")
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("cannot find subvolume %d to determine parent: %v", rootID, err)
} }
return subvolSearchByUUID(mnt, st.ParentUUID) return subvolSearchByUUID(mnt, st.ParentUUID)
} }
@ -215,7 +215,9 @@ func findGoodParent(mnt *os.File, rootID objectID, cloneSrc []objectID) (objectI
) )
for _, id := range cloneSrc { for _, id := range cloneSrc {
parent2, err := getParent(mnt, id) parent2, err := getParent(mnt, id)
if err != nil { if err == ErrNotFound {
continue
} else if err != nil {
return 0, err return 0, err
} }
if parent2.RootID != parent.RootID { if parent2.RootID != parent.RootID {
@ -233,8 +235,11 @@ func findGoodParent(mnt *os.File, rootID objectID, cloneSrc []objectID) (objectI
bestParent, bestDiff = parent2, uint64(diff) bestParent, bestDiff = parent2, uint64(diff)
} }
} }
if bestParent == nil { if bestParent != nil {
return 0, ErrNotFound return bestParent.RootID, nil
} }
return bestParent.RootID, nil if !parent.ParentUUID.IsZero() {
return findGoodParent(mnt, parent.RootID, cloneSrc)
}
return 0, ErrNotFound
} }