Patch "ext4: scope ret locally in ext4_try_to_trim_range()" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

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

    ext4: scope ret locally in ext4_try_to_trim_range()

to the 5.15-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:
     ext4-scope-ret-locally-in-ext4_try_to_trim_range.patch
and it can be found in the queue-5.15 subdirectory.

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



commit 729efa407d2267c2ab0778f291cff3f71260da96
Author: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
Date:   Fri Aug 20 14:08:53 2021 +0200

    ext4: scope ret locally in ext4_try_to_trim_range()
    
    [ Upstream commit afcc4e32f606dbfb47aa7309172c89174b86e74c ]
    
    As commit 6920b3913235 ("ext4: add new helper interface
    ext4_try_to_trim_range()") moves some code into the separate function
    ext4_try_to_trim_range(), the use of the variable ret within that
    function is more limited and can be adjusted as well.
    
    Scope the use of the variable ret locally and drop dead assignments.
    
    No functional change.
    
    Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20210820120853.23134-1-lukas.bulwahn@xxxxxxxxx
    Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
    Stable-dep-of: 45e4ab320c9b ("ext4: move setting of trimmed bit into ext4_try_to_trim_range()")
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 7e7153c673c0d..6eb445bbb2be8 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -6441,7 +6441,6 @@ __releases(ext4_group_lock_ptr(sb, e4b->bd_group))
 {
 	ext4_grpblk_t next, count, free_count;
 	void *bitmap;
-	int ret = 0;
 
 	bitmap = e4b->bd_bitmap;
 	start = (e4b->bd_info->bb_first_free > start) ?
@@ -6456,10 +6455,10 @@ __releases(ext4_group_lock_ptr(sb, e4b->bd_group))
 		next = mb_find_next_bit(bitmap, max + 1, start);
 
 		if ((next - start) >= minblocks) {
-			ret = ext4_trim_extent(sb, start, next - start, e4b);
+			int ret = ext4_trim_extent(sb, start, next - start, e4b);
+
 			if (ret && ret != -EOPNOTSUPP)
 				break;
-			ret = 0;
 			count += next - start;
 		}
 		free_count += next - start;