Merge remote-tracking branch 'asoc/fix/core' into asoc-linus

[linux.git] / fs / btrfs / check-integrity.c

diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index 0e8388e72d8d0c7dd3884a0d0ff7e8cabf120fbb..ce92ae30250fb256fbbbdb9158315c757a24adc1 100644 (file)
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -1093,6 +1093,7 @@ leaf_item_out_of_bounce_error:
                                        next_stack =
                                            btrfsic_stack_frame_alloc();
                                        if (NULL == next_stack) {
+                                               sf->error = -1;
                                                btrfsic_release_block_ctx(
                                                                &sf->
                                                                next_block_ctx);
@@ -1190,8 +1191,10 @@ continue_with_current_node_stack_frame:
                                    sf->next_block_ctx.datav[0];
 
                                next_stack = btrfsic_stack_frame_alloc();
-                               if (NULL == next_stack)
+                               if (NULL == next_stack) {
+                                       sf->error = -1;
                                        goto one_stack_frame_backwards;
+                               }
 
                                next_stack->i = -1;
                                next_stack->block = sf->next_block;