Skip to content

Commit

Permalink
Btrfs: do not BUG_ON in prepare_to_reloc
Browse files Browse the repository at this point in the history
We can bail out from here gracefully instead of a cold BUG_ON.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
  • Loading branch information
Liu Bo authored and Josef Bacik committed Mar 4, 2013
1 parent e1a1267 commit 2881894
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion fs/btrfs/relocation.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 2881894

Please sign in to comment.