|
@@ -1617,7 +1617,8 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
path = btrfs_alloc_path();
|
|
path = btrfs_alloc_path();
|
|
- BUG_ON(!path);
|
|
|
|
|
|
+ if (!path)
|
|
|
|
+ return -ENOMEM;
|
|
|
|
|
|
nritems = btrfs_header_nritems(eb);
|
|
nritems = btrfs_header_nritems(eb);
|
|
for (i = 0; i < nritems; i++) {
|
|
for (i = 0; i < nritems; i++) {
|
|
@@ -1723,7 +1724,9 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|
|
if (*level == 1) {
|
|
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]++;
|
|
path->slots[*level]++;
|
|
if (wc->free) {
|
|
if (wc->free) {
|
|
@@ -1788,8 +1791,11 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans,
|
|
parent = path->nodes[*level + 1];
|
|
parent = path->nodes[*level + 1];
|
|
|
|
|
|
root_owner = btrfs_header_owner(parent);
|
|
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]));
|
|
btrfs_header_generation(path->nodes[*level]));
|
|
|
|
+ if (ret)
|
|
|
|
+ return ret;
|
|
|
|
+
|
|
if (wc->free) {
|
|
if (wc->free) {
|
|
struct extent_buffer *next;
|
|
struct extent_buffer *next;
|
|
|
|
|