diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2022-06-26 21:27:09 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2022-06-26 21:27:09 -0600 |
| commit | bfb830d024fd6309d81e20a7d21a2433c4ec9c93 (patch) | |
| tree | 14c5ade187be28e1c5bb6e07fe916d76611ce7b5 | |
| parent | 92bc32f6092a3500075a270cd1aeabfaaad96569 (diff) | |
fixup dump-tree
| -rw-r--r-- | pkg/btrfsmisc/print_tree.go | 4 | ||||
| -rwxr-xr-x | scripts/diff-dump-tree.sh | 1 | ||||
| -rw-r--r-- | scripts/dump-tree-diff.sh | 5 |
3 files changed, 3 insertions, 7 deletions
diff --git a/pkg/btrfsmisc/print_tree.go b/pkg/btrfsmisc/print_tree.go index 580a0ca..a57e69e 100644 --- a/pkg/btrfsmisc/print_tree.go +++ b/pkg/btrfsmisc/print_tree.go @@ -154,7 +154,7 @@ func PrintTree(fs *btrfs.FS, root btrfs.LogicalAddr) error { case btrfsitem.FreeSpaceBitmap: fmt.Printf("\t\tfree space bitmap\n") case btrfsitem.Chunk: - fmt.Printf("\t\tlength %v owner %d stripe_len %v type %v\n", + fmt.Printf("\t\tlength %d owner %d stripe_len %v type %v\n", body.Head.Size, body.Head.Owner, body.Head.StripeLen, body.Head.Type) fmt.Printf("\t\tio_align %v io_width %v sector_size %v\n", body.Head.IOOptimalAlign, body.Head.IOOptimalWidth, body.Head.IOMinSize) @@ -183,7 +183,7 @@ func PrintTree(fs *btrfs.FS, root btrfs.LogicalAddr) error { case btrfsitem.DevExtent: fmt.Printf(""+ "\t\tdev extent chunk_tree %v\n"+ - "\t\tchunk_objectid %v chunk_offset %v length %v\n"+ + "\t\tchunk_objectid %v chunk_offset %d length %d\n"+ "\t\tchunk_tree_uuid %v\n", body.ChunkTree, body.ChunkObjectID, body.ChunkOffset, body.Length, body.ChunkTreeUUID) diff --git a/scripts/diff-dump-tree.sh b/scripts/diff-dump-tree.sh index 588242f..9e650f3 100755 --- a/scripts/diff-dump-tree.sh +++ b/scripts/diff-dump-tree.sh @@ -1,4 +1,5 @@ #!/bin/bash +make -C ../btrfs-progs diff -u \ <(../btrfs-progs/btrfs inspect dump-tree --noscan ../scratch/new.img | sed -e 's/ UNKNOWN.0 / UNTYPED /g' -e 's/\b18446744073709551615\b/-1/g') \ <(go run ./cmd/btrfs-dump-tree/ ../scratch/new.img) diff --git a/scripts/dump-tree-diff.sh b/scripts/dump-tree-diff.sh deleted file mode 100644 index 9e650f3..0000000 --- a/scripts/dump-tree-diff.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -make -C ../btrfs-progs -diff -u \ - <(../btrfs-progs/btrfs inspect dump-tree --noscan ../scratch/new.img | sed -e 's/ UNKNOWN.0 / UNTYPED /g' -e 's/\b18446744073709551615\b/-1/g') \ - <(go run ./cmd/btrfs-dump-tree/ ../scratch/new.img) |