24434a14bd
Sync to a long-awaited upstream release. Version update. Only a handful of local packages that will be upstreamed later. This set of changes is not suitable for direct copy to currently released products because there are changes in mkfs defaults (12.x, 13.x, SLES). Fine for Factory. (forwarded request 208357 from dsterba) OBS-URL: https://build.opensuse.org/request/show/208360 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=36
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 3d75a27a857ae81f7cd64de886a293208be15af6 Mon Sep 17 00:00:00 2001
|
|
From: Josef Bacik <josef@redhat.com>
|
|
Date: Wed, 4 Jan 2012 10:03:33 -0500
|
|
Subject: [PATCH 166/170] Btrfs-progs: add some verbose output to find-root
|
|
|
|
Trying to track down why we can't find roots, add some verbose output so we know
|
|
what chunks we're scanning and when we move to new chunks. Thanks,
|
|
|
|
Signed-off-by: Josef Bacik <josef@redhat.com>
|
|
---
|
|
btrfs-find-root.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
Index: btrfs-progs-v0.20-rc1-598-g8116550e1662/btrfs-find-root.c
|
|
===================================================================
|
|
--- btrfs-progs-v0.20-rc1-598-g8116550e1662.orig/btrfs-find-root.c
|
|
+++ btrfs-progs-v0.20-rc1-598-g8116550e1662/btrfs-find-root.c
|
|
@@ -229,6 +229,10 @@ static int find_root(struct btrfs_root *
|
|
return ret;
|
|
|
|
offset = metadata_offset;
|
|
+ if (verbose)
|
|
+ printf("Checking metadata chunk %Lu, size %Lu\n",
|
|
+ metadata_offset, metadata_size);
|
|
+
|
|
while (1) {
|
|
u64 map_length = 4096;
|
|
u64 type;
|
|
@@ -239,6 +243,8 @@ static int find_root(struct btrfs_root *
|
|
break;
|
|
}
|
|
if (offset >= (metadata_offset + metadata_size)) {
|
|
+ if (verbose)
|
|
+ printf("Moving to the next metadata chunk\n");
|
|
err = btrfs_next_metadata(&root->fs_info->mapping_tree,
|
|
&metadata_offset,
|
|
&metadata_size);
|
|
@@ -247,6 +253,9 @@ static int find_root(struct btrfs_root *
|
|
break;
|
|
}
|
|
offset = metadata_offset;
|
|
+ if (verbose)
|
|
+ printf("Checking metadata chunk %Lu, size %Lu"
|
|
+ "\n", metadata_offset, metadata_size);
|
|
}
|
|
err = __btrfs_map_block(&root->fs_info->mapping_tree, READ,
|
|
offset, &map_length, &type,
|