From bbabc9ab42accbd37072735419cc0552dc8917ee Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 20 Mar 2023 12:29:20 -0400 Subject: btrfs: Subvolume: Use LookupTreeRoot --- cmd/btrfs-rec/inspect/lsfiles/lsfiles.go | 3 +++ cmd/btrfs-rec/inspect/mount/mount.go | 1 + cmd/btrfs-rec/inspect_lsfiles.go | 1 + 3 files changed, 5 insertions(+) (limited to 'cmd') 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)) }), -- cgit v1.2.3-2-g168b