]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Btrfs: add missing error checks to add_data_references
authorFilipe David Borba Manana <fdmanana@gmail.com>
Sat, 13 Jul 2013 11:25:15 +0000 (12:25 +0100)
committerChris Mason <chris.mason@fusionio.com>
Sun, 1 Sep 2013 11:57:35 +0000 (07:57 -0400)
The function relocation.c:add_data_references() was not checking
if all calls to __add_tree_block() and find_data_references() were
succeeding or not.

Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
fs/btrfs/relocation.c

index 12096496cc99eb24e6412ebc3ed5780f0e2b2430..295a6115c326818b007dc022fb8176507a73097a 100644 (file)
@@ -3628,7 +3628,7 @@ int add_data_references(struct reloc_control *rc,
        unsigned long ptr;
        unsigned long end;
        u32 blocksize = btrfs_level_size(rc->extent_root, 0);
-       int ret;
+       int ret = 0;
        int err = 0;
 
        eb = path->nodes[0];
@@ -3655,6 +3655,10 @@ int add_data_references(struct reloc_control *rc,
                } else {
                        BUG();
                }
+               if (ret) {
+                       err = ret;
+                       goto out;
+               }
                ptr += btrfs_extent_inline_ref_size(key.type);
        }
        WARN_ON(ptr > end);
@@ -3700,6 +3704,7 @@ int add_data_references(struct reloc_control *rc,
                }
                path->slots[0]++;
        }
+out:
        btrfs_release_path(path);
        if (err)
                free_block_list(blocks);