Commit db0a4a7b authored by Christophe JAILLET's avatar Christophe JAILLET Committed by David Sterba
Browse files

btrfs: fix an error handling path in btrfs_defrag_leaves() 



All error handling paths end to 'out', except this memory allocation
failure.

This is spurious. So branch to the error handling path also in this case.
It will add a call to:

	memset(&root->defrag_progress, 0,
	       sizeof(root->defrag_progress));

Fixes: 6702ed49 ("Btrfs: Add run time btree defrag, and an ioctl to force btree defrag")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent abe3bf74

fs/btrfs/defrag.c

+4 −2
Original line number Diff line number Diff line
@@ -358,8 +358,10 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans, 
		goto out;



	path = btrfs_alloc_path();

	if (!path)

		return -ENOMEM;

	if (!path) {

		ret = -ENOMEM;

		goto out;

	}



	level = btrfs_header_level(root->node);