diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2022-12-12 21:01:43 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-12-15 19:16:50 +0100 |
| commit | db0a4a7b8e95f9312a59a67cbd5bc589f090e13d (patch) | |
| tree | 71e82d5cc497b0ea8c8bd50d69c85ff2db853c3e /fs/btrfs/defrag.c | |
| parent | abe3bf7425fb695a9b37394af18b9ea58a800802 (diff) | |
| download | lwn-db0a4a7b8e95f9312a59a67cbd5bc589f090e13d.tar.gz lwn-db0a4a7b8e95f9312a59a67cbd5bc589f090e13d.zip | |
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: 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>
Diffstat (limited to 'fs/btrfs/defrag.c')
| -rw-r--r-- | fs/btrfs/defrag.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/defrag.c b/fs/btrfs/defrag.c index 0a3c261b69c9..d81b764a7644 100644 --- a/fs/btrfs/defrag.c +++ b/fs/btrfs/defrag.c @@ -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); |