Patch "btrfs: fix an error handling path in btrfs_defrag_leaves()" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    btrfs: fix an error handling path in btrfs_defrag_leaves()

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     btrfs-fix-an-error-handling-path-in-btrfs_defrag_lea.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit e78ab9a5f5bdecc66b642b962fb92f875585c0d4
Author: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
Date:   Mon Dec 12 21:01:43 2022 +0100

    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@xxxxxxxxxx>
    Reviewed-by: David Sterba <dsterba@xxxxxxxx>
    Signed-off-by: David Sterba <dsterba@xxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/fs/btrfs/defrag.c b/fs/btrfs/defrag.c
index b6cf39f4e7e4..072ab9a1374b 100644
--- a/fs/btrfs/defrag.c
+++ b/fs/btrfs/defrag.c
@@ -31,8 +31,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);