diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2023-01-01 22:43:58 -0700 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2023-01-01 22:43:58 -0700 |
| commit | d675f41242c043ddc4c6c1a1fb8aabcfd324aae2 (patch) | |
| tree | 4f2afbce761eb377ad0b0ab2e4fb2f478ff844f5 /lib/btrfsprogs/btrfsutil/broken_btree.go | |
| parent | 9971e38110d5f90d15c7b78f396f2638b3952a96 (diff) | |
| parent | 6e1a9fbb1e9a943e04902ed3a4958f6821e39456 (diff) | |
Merge branch 'lukeshu/lint'
Diffstat (limited to 'lib/btrfsprogs/btrfsutil/broken_btree.go')
| -rw-r--r-- | lib/btrfsprogs/btrfsutil/broken_btree.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/btrfsprogs/btrfsutil/broken_btree.go b/lib/btrfsprogs/btrfsutil/broken_btree.go index 28e8b1d..f0b298e 100644 --- a/lib/btrfsprogs/btrfsutil/broken_btree.go +++ b/lib/btrfsprogs/btrfsutil/broken_btree.go @@ -1,4 +1,4 @@ -// Copyright (C) 2022 Luke Shumaker <lukeshu@lukeshu.com> +// Copyright (C) 2022-2023 Luke Shumaker <lukeshu@lukeshu.com> // // SPDX-License-Identifier: GPL-2.0-or-later @@ -57,7 +57,7 @@ func newTreeIndex(arena *SkinnyPathArena) treeIndex { } type brokenTrees struct { - ctx context.Context + ctx context.Context //nolint:containedctx // don't have an option while keeping the same API inner *btrfs.FS arena *SkinnyPathArena @@ -304,7 +304,7 @@ func (bt *brokenTrees) TreeWalk(ctx context.Context, treeID btrfsprim.ObjID, err node, err = bt.inner.ReadNode(itemPath.Parent()) if err != nil { errHandle(&btrfstree.TreeError{Path: itemPath, Err: err}) - return nil + return nil //nolint:nilerr // We already called errHandle(). } } item := node.Data.BodyLeaf[itemPath.Node(-1).FromItemIdx] |