diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2023-03-23 21:33:19 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2023-03-23 21:33:19 -0600 |
| commit | bf5eed5af5c34b8cf9dc2985a7c4475602929bb1 (patch) | |
| tree | 9cb910940a1e16982f5c5012a4fbeb37ba172f82 /cmd | |
| parent | f0a9faf21dbe508d57da3b18be9121559c70876a (diff) | |
| parent | 418553acc64567ebc95122e28b07657526c92923 (diff) | |
Merge branch 'lukeshu/tree-api-pt1-changes'
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/btrfs-rec/inspect/lsfiles/lsfiles.go | 3 | ||||
| -rw-r--r-- | cmd/btrfs-rec/inspect/mount/mount.go | 1 | ||||
| -rw-r--r-- | cmd/btrfs-rec/inspect_lsfiles.go | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go b/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go index a713b8a..e42050f 100644 --- a/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go +++ b/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go @@ -8,6 +8,7 @@ package lsfiles import ( + "context" "errors" "fmt" "io" @@ -27,6 +28,7 @@ import ( ) func LsFiles( + ctx context.Context, out io.Writer, fs interface { btrfstree.TreeOperator @@ -42,6 +44,7 @@ func LsFiles( }() printSubvol(out, "", true, "/", btrfs.NewSubvolume( + ctx, fs, btrfsprim.FS_TREE_OBJECTID, false, diff --git a/cmd/btrfs-rec/inspect/mount/mount.go b/cmd/btrfs-rec/inspect/mount/mount.go index 4049393..d4d2e0a 100644 --- a/cmd/btrfs-rec/inspect/mount/mount.go +++ b/cmd/btrfs-rec/inspect/mount/mount.go @@ -53,6 +53,7 @@ func MountRO(ctx context.Context, fs *btrfs.FS, mountpoint string, noChecksums b rootSubvol := &subvolume{ Subvolume: btrfs.NewSubvolume( + ctx, btrfsutil.NewOldRebuiltForrest(ctx, fs), btrfsprim.FS_TREE_OBJECTID, noChecksums, diff --git a/cmd/btrfs-rec/inspect_lsfiles.go b/cmd/btrfs-rec/inspect_lsfiles.go index 04b5ec5..00a4873 100644 --- a/cmd/btrfs-rec/inspect_lsfiles.go +++ b/cmd/btrfs-rec/inspect_lsfiles.go @@ -30,6 +30,7 @@ func init() { }() return lsfiles.LsFiles( + cmd.Context(), out, btrfsutil.NewOldRebuiltForrest(cmd.Context(), fs)) }), |