Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 647f63bd authored by Filipe David Borba Manana's avatar Filipe David Borba Manana Committed by Chris Mason
Browse files

Btrfs: add missing error checks to add_data_references 



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: default avatarFilipe David Borba Manana <fdmanana@gmail.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent ccf39f92

fs/btrfs/relocation.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -3628,7 +3628,7 @@ int add_data_references(struct reloc_control *rc, 
	unsigned long ptr;

	unsigned long ptr;

	unsigned long end;

	unsigned long end;

	u32 blocksize = btrfs_level_size(rc->extent_root, 0);

	u32 blocksize = btrfs_level_size(rc->extent_root, 0);

	int ret;

	int ret = 0;

	int err = 0;

	int err = 0;





	eb = path->nodes[0];

	eb = path->nodes[0];
@@ -3655,6 +3655,10 @@ int add_data_references(struct reloc_control *rc, 
		} else {

		} else {

			BUG();

			BUG();

		}

		}

		if (ret) {

			err = ret;

			goto out;

		}

		ptr += btrfs_extent_inline_ref_size(key.type);

		ptr += btrfs_extent_inline_ref_size(key.type);

	}

	}

	WARN_ON(ptr > end);

	WARN_ON(ptr > end);
@@ -3700,6 +3704,7 @@ int add_data_references(struct reloc_control *rc, 
		}

		}

		path->slots[0]++;

		path->slots[0]++;

	}

	}

out:

	btrfs_release_path(path);

	btrfs_release_path(path);

	if (err)

	if (err)

		free_block_list(blocks);

		free_block_list(blocks);