From 7c9de305d3dd364d6d76c8869d55a09bf80b28a8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 2 Mar 2023 16:02:42 -0700 Subject: btrfs: Migrate to the new btrfstree.Forrest API --- cmd/btrfs-rec/inspect/lsfiles/lsfiles.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'cmd/btrfs-rec/inspect/lsfiles') diff --git a/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go b/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go index af8f690..dec472d 100644 --- a/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go +++ b/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go @@ -21,8 +21,6 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsprim" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfstree" - "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol" - "git.lukeshu.com/btrfs-progs-ng/lib/diskio" "git.lukeshu.com/btrfs-progs-ng/lib/maps" "git.lukeshu.com/btrfs-progs-ng/lib/textui" ) @@ -32,8 +30,7 @@ func LsFiles( out io.Writer, fs interface { btrfstree.TreeOperator - Superblock() (*btrfstree.Superblock, error) - diskio.ReaderAt[btrfsvol.LogicalAddr] + btrfs.ReadableFS }, ) (err error) { defer func() { -- cgit v1.2.3-2-g168b From f9fd200f70d5746e6e5b64e1c6e7ed2474081964 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 2 Mar 2023 16:02:42 -0700 Subject: btrfsutil, cmd: Migrate to the new btrfstree.Forrest API --- cmd/btrfs-rec/inspect/lsfiles/lsfiles.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'cmd/btrfs-rec/inspect/lsfiles') diff --git a/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go b/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go index dec472d..d172e2e 100644 --- a/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go +++ b/cmd/btrfs-rec/inspect/lsfiles/lsfiles.go @@ -20,7 +20,6 @@ import ( "git.lukeshu.com/btrfs-progs-ng/lib/btrfs" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem" "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsprim" - "git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfstree" "git.lukeshu.com/btrfs-progs-ng/lib/maps" "git.lukeshu.com/btrfs-progs-ng/lib/textui" ) @@ -28,10 +27,7 @@ import ( func LsFiles( ctx context.Context, out io.Writer, - fs interface { - btrfstree.TreeOperator - btrfs.ReadableFS - }, + fs btrfs.ReadableFS, ) (err error) { defer func() { if _err := derror.PanicToError(recover()); _err != nil { -- cgit v1.2.3-2-g168b