summaryrefslogtreecommitdiff
path: root/lib/btrfsprogs/btrfsutil/open.go
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2022-07-12 11:30:13 -0600
committerLuke Shumaker <lukeshu@lukeshu.com>2022-07-12 11:43:25 -0600
commit68555944f694e941b9cac3f8349364ec965db2fb (patch)
tree3b966ca9c633a1cf9740c8ca17904cf31121eda3 /lib/btrfsprogs/btrfsutil/open.go
parenta0daaacdd61f196fbc0ca90ed996e7eeb4d4fcdd (diff)
Don't let TreeWalk bail early, add TreeID in to TreePath
Diffstat (limited to 'lib/btrfsprogs/btrfsutil/open.go')
-rw-r--r--lib/btrfsprogs/btrfsutil/open.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/btrfsprogs/btrfsutil/open.go b/lib/btrfsprogs/btrfsutil/open.go
index 80bfe7a..c237b54 100644
--- a/lib/btrfsprogs/btrfsutil/open.go
+++ b/lib/btrfsprogs/btrfsutil/open.go
@@ -23,8 +23,8 @@ func Open(ctx context.Context, flag int, filenames ...string) (*btrfs.FS, error)
_ = fs.Close()
return nil, fmt.Errorf("device file %q: %w", filename, err)
}
- if err := fs.AddDevice(&btrfs.Device{File: fh}); err != nil {
- dlog.Errorf(ctx, "device file %q: %v", filename, err)
+ if err := fs.AddDevice(ctx, &btrfs.Device{File: fh}); err != nil {
+ return nil, fmt.Errorf("device file %q: %w", filename, err)
}
}
return fs, nil