linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Liu Bo <bo.li.liu@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v2 6/7] Btrfs: remove BUG_ON in __add_tree_block
Date: Mon,  7 Aug 2017 15:55:30 -0600	[thread overview]
Message-ID: <20170807215531.12423-7-bo.li.liu@oracle.com> (raw)
In-Reply-To: <20170807215531.12423-1-bo.li.liu@oracle.com>

The BUG_ON() can be triggered when the caller is processing an invalid
extent inline ref, e.g.

a shared data ref is offered instead of a extent data ref, such that
it tries to find a non-exist tree block and then btrfs_search_slot
returns 1 for no such item.

This replaces the BUG_ON() with a WARN() followed by calling
btrfs_print_leaf() to show more details about what's going on and
returning -EINVAL to upper callers.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
---
 fs/btrfs/relocation.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 4806e78..cc6150e 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -32,6 +32,7 @@
 #include "free-space-cache.h"
 #include "inode-map.h"
 #include "qgroup.h"
+#include "print-tree.h"
 
 /*
  * backref_node, mapping_node and tree_block start with this
@@ -3485,7 +3486,15 @@ static int __add_tree_block(struct reloc_control *rc,
 			goto again;
 		}
 	}
-	BUG_ON(ret);
+	if (ret) {
+		ASSERT(ret == 1);
+		btrfs_print_leaf(rc->extent_root->fs_info, path->nodes[0]);
+		WARN(1,
+	     "tree block extent item (%llu) is not found in extent tree\n",
+		     bytenr);
+		ret = -EINVAL;
+		goto out;
+	}
 
 	ret = add_tree_block(rc, &key, path, blocks);
 out:
-- 
2.9.4


  parent reply	other threads:[~2017-08-07 22:56 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-07 21:55 [PATCH v2 0/7] add sanity check for extent inline ref type Liu Bo
2017-08-07 21:55 ` [PATCH v2 1/7] Btrfs: add a helper to retrive " Liu Bo
2017-08-07 21:55 ` [PATCH v2 2/7] Btrfs: convert to use btrfs_get_extent_inline_ref_type Liu Bo
2017-08-07 21:55 ` [PATCH v2 3/7] Btrfs: remove BUG() in btrfs_extent_inline_ref_size Liu Bo
2017-08-07 21:55 ` [PATCH v2 4/7] Btrfs: remove BUG() in print_extent_item Liu Bo
2017-08-07 21:55 ` [PATCH v2 5/7] Btrfs: remove BUG() in add_data_reference Liu Bo
2017-08-07 21:55 ` Liu Bo [this message]
2017-08-07 21:55 ` [PATCH v2 7/7] Btrfs: add one more sanity check for shared ref type Liu Bo
2017-08-16 14:53 ` [PATCH v2 0/7] add sanity check for extent inline " David Sterba
2017-08-16 16:04   ` Liu Bo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170807215531.12423-7-bo.li.liu@oracle.com \
    --to=bo.li.liu@oracle.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).