Skip to content

Commit

Permalink
btrfs: Don't BUG_ON alloc_path errors in replay_one_buffer()
Browse files Browse the repository at this point in the history
The two ->process_func call sites in tree-log.c which were ignoring a return
code have also been updated to gracefully exit as well.

Signed-off-by: Mark Fasheh <mfasheh@suse.com>
  • Loading branch information
Mark Fasheh committed Jul 14, 2011
1 parent d8926bb commit 1e5063d
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions fs/btrfs/tree-log.c
Original file line number Diff line number Diff line change
Expand Up @@ -1617,7 +1617,8 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
return 0;

path = btrfs_alloc_path();
BUG_ON(!path);
if (!path)
return -ENOMEM;

nritems = btrfs_header_nritems(eb);
for (i = 0; i < nritems; i++) {
Expand Down Expand Up @@ -1723,7 +1724,9 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
return -ENOMEM;

if (*level == 1) {
wc->process_func(root, next, wc, ptr_gen);
ret = wc->process_func(root, next, wc, ptr_gen);
if (ret)
return ret;

path->slots[*level]++;
if (wc->free) {
Expand Down Expand Up @@ -1788,8 +1791,11 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,
parent = path->nodes[*level + 1];

root_owner = btrfs_header_owner(parent);
wc->process_func(root, path->nodes[*level], wc,
ret = wc->process_func(root, path->nodes[*level], wc,
btrfs_header_generation(path->nodes[*level]));
if (ret)
return ret;

if (wc->free) {
struct extent_buffer *next;

Expand Down

0 comments on commit 1e5063d

Please sign in to comment.