]> git.baikalelectronics.ru Git - kernel.git/commit
btrfs: fix an error handling path in btrfs_defrag_leaves()
authorSasha Levin <sashal@kernel.org>
Sun, 8 Jan 2023 13:24:19 +0000 (08:24 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Jan 2023 11:01:56 +0000 (12:01 +0100)
commit861dd7356c2ab8887a6f87fd67ed29de92f4ce38
treea157e957c4bddd4e1c67c62c6cb83ac068fb381d
parentd0a6b1c441b97ac3ab2b5feb6184cca293fac4fb
btrfs: fix an error handling path in btrfs_defrag_leaves()

[ Upstream commit db0a4a7b8e95f9312a59a67cbd5bc589f090e13d ]

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: 6702ed490ca0 ("Btrfs: Add run time btree defrag, and an ioctl to force btree defrag")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/btrfs/tree-defrag.c