[1/3] Disambiguate between cases where add_tree_backref fails

Commit Message

Christophe de Dinechin April 28, 2017, 9:12 a.m. UTC

See https://bugzilla.redhat.com/show_bug.cgi?id=1435567 for an example
where the message occurs,

Signed-off-by: Christophe de Dinechin <[e-mail]>
---
 cmds-check.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

David Sterba May 2, 2017, 4:27 p.m. UTC | #1

On Fri, Apr 28, 2017 at 11:12:35AM +0200, Christophe de Dinechin wrote:
> See https://bugzilla.redhat.com/show_bug.cgi?id=1435567 for an example
> where the message occurs,
> 
> Signed-off-by: Christophe de Dinechin <[e-mail]>

Applied, thanks. I've moved the strings to next line so they don't
overflow 80 cols.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/cmds-check.c b/cmds-check.c
index 17b7efb..2d3ebc1 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -6832,14 +6832,14 @@  static int process_extent_item(struct btrfs_root *root,
 			ret = add_tree_backref(extent_cache, key.objectid,
 					0, offset, 0);
 			if (ret < 0)
-				error("add_tree_backref failed: %s",
+				error("add_tree_backref failed (extent items tree block): %s",
 				      strerror(-ret));
 			break;
 		case BTRFS_SHARED_BLOCK_REF_KEY:
 			ret = add_tree_backref(extent_cache, key.objectid,
 					offset, 0, 0);
 			if (ret < 0)
-				error("add_tree_backref failed: %s",
+				error("add_tree_backref failed (extent items shared block): %s",
 				      strerror(-ret));
 			break;
 		case BTRFS_EXTENT_DATA_REF_KEY:
@@ -7753,7 +7753,7 @@  static int run_next_block(struct btrfs_root *root,
 				ret = add_tree_backref(extent_cache,
 						key.objectid, 0, key.offset, 0);
 				if (ret < 0)
-					error("add_tree_backref failed: %s",
+					error("add_tree_backref failed (leaf tree block): %s",
 					      strerror(-ret));
 				continue;
 			}
@@ -7761,7 +7761,7 @@  static int run_next_block(struct btrfs_root *root,
 				ret = add_tree_backref(extent_cache,
 						key.objectid, key.offset, 0, 0);
 				if (ret < 0)
-					error("add_tree_backref failed: %s",
+					error("add_tree_backref failed (leaf shared block): %s",
 					      strerror(-ret));
 				continue;
 			}
@@ -7866,7 +7866,7 @@  static int run_next_block(struct btrfs_root *root,
 			ret = add_tree_backref(extent_cache, ptr, parent,
 					owner, 1);
 			if (ret < 0) {
-				error("add_tree_backref failed: %s",
+				error("add_tree_backref failed (non-leaf block): %s",
 				      strerror(-ret));
 				continue;
 			}