From 09677d5c56bbc6034d683de8977c94e4cb3a106c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 14 Mar 2023 13:18:31 -0600 Subject: cmd/btrfs-rec: inspect ls-files: Also send panics to stderr --- cmd/btrfs-rec/inspect_lsfiles.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/btrfs-rec/inspect_lsfiles.go b/cmd/btrfs-rec/inspect_lsfiles.go index 395f60a..dacf214 100644 --- a/cmd/btrfs-rec/inspect_lsfiles.go +++ b/cmd/btrfs-rec/inspect_lsfiles.go @@ -40,9 +40,9 @@ func init() { } }() defer func() { - if r := derror.PanicToError(recover()); r != nil { - textui.Fprintf(out, "\n\n%+v\n", r) - err = fmt.Errorf("panicked") + if _err := derror.PanicToError(recover()); _err != nil { + textui.Fprintf(out, "\n\n%+v\n", _err) + err = _err } }() ctx := cmd.Context() -- cgit v1.2.3-2-g168b From 59c432ca78d30193fca20f14280743cd430b7095 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 14 Mar 2023 13:23:19 -0600 Subject: cmd/btrfs-rec: inspect ls-files: Fix grammar in an error message --- cmd/btrfs-rec/inspect_lsfiles.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/btrfs-rec/inspect_lsfiles.go b/cmd/btrfs-rec/inspect_lsfiles.go index dacf214..7ecaaf0 100644 --- a/cmd/btrfs-rec/inspect_lsfiles.go +++ b/cmd/btrfs-rec/inspect_lsfiles.go @@ -215,7 +215,7 @@ func printDirEntry(out io.Writer, prefix string, isLast bool, subvol *btrfs.Subv } printPipe(out, prefix, isLast, name, file) default: - panic(fmt.Errorf("TODO: I don't know how to handle an fileType=%v: %q", + panic(fmt.Errorf("TODO: I don't know how to handle a fileType=%v: %q", entry.Type, name)) } } -- cgit v1.2.3-2-g168b From 5dcdb9928d6a746dd69f620d96531ae2fcbd2fe1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 14 Mar 2023 13:39:34 -0600 Subject: fixup! btrfstree: Add a FreeNodeRef function, use it --- lib/btrfsprogs/btrfsutil/broken_btree.go | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/btrfsprogs/btrfsutil/broken_btree.go b/lib/btrfsprogs/btrfsutil/broken_btree.go index 15641ab..b7663fa 100644 --- a/lib/btrfsprogs/btrfsutil/broken_btree.go +++ b/lib/btrfsprogs/btrfsutil/broken_btree.go @@ -281,6 +281,7 @@ func (bt *brokenTrees) TreeSearchAll(treeID btrfsprim.ObjID, fn func(btrfsprim.K } } ret[i] = node.Data.BodyLeaf[itemPath.Node(-1).FromItemIdx] + ret[i].Body = ret[i].Body.CloneItem() } btrfstree.FreeNodeRef(node) -- cgit v1.2.3-2-g168b