From: Liu Bo <bo.li.liu@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 4/6] Btrfs: do not BUG_ON in prepare_to_reloc
Date: Tue, 5 Mar 2013 00:25:39 +0800 [thread overview]
Message-ID: <1362414341-17306-5-git-send-email-bo.li.liu@oracle.com> (raw)
In-Reply-To: <1362414341-17306-1-git-send-email-bo.li.liu@oracle.com>
We can bail out from here gracefully instead of a cold BUG_ON.
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
---
fs/btrfs/relocation.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 8cae3d7..c45c833 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3731,7 +3731,15 @@ int prepare_to_relocate(struct reloc_control *rc)
set_reloc_control(rc);
trans = btrfs_join_transaction(rc->extent_root);
- BUG_ON(IS_ERR(trans));
+ if (IS_ERR(trans)) {
+ unset_reloc_control(rc);
+ /*
+ * extent tree is not a ref_cow tree and has no reloc_root to
+ * cleanup. And callers are responsible to free the above
+ * block rsv.
+ */
+ return PTR_ERR(trans);
+ }
btrfs_commit_transaction(trans, rc->extent_root);
return 0;
}
--
1.7.7
next prev parent reply other threads:[~2013-03-04 16:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-04 16:25 [PATCH 0/6] Several bugfixes Liu Bo
2013-03-04 16:25 ` [PATCH 1/6] Btrfs: check for NULL pointer in updating reloc roots Liu Bo
2013-03-04 16:25 ` [PATCH 2/6] Btrfs: build up error handling for merge_reloc_roots Liu Bo
2013-03-18 14:16 ` David Sterba
2013-03-19 12:16 ` Liu Bo
2013-03-28 14:15 ` David Sterba
2013-03-04 16:25 ` [PATCH 3/6] Btrfs: free all recorded tree blocks on error Liu Bo
2013-03-04 16:25 ` Liu Bo [this message]
2013-03-04 16:25 ` [PATCH 5/6] Btrfs: do not BUG_ON on aborted situation Liu Bo
2013-03-04 16:25 ` [PATCH 6/6] Btrfs: avoid deadlock on transaction waiting list 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=1362414341-17306-5-git-send-email-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).