ext4: scope ret locally in ext4_try_to_trim_range()
authorLukas Bulwahn <lukas.bulwahn@gmail.com>
Fri, 20 Aug 2021 12:08:53 +0000 (14:08 +0200)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 4 Nov 2021 14:33:25 +0000 (10:33 -0400)
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@gmail.com>
Link: https://lore.kernel.org/r/20210820120853.23134-1-lukas.bulwahn@gmail.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/mballoc.c

index 72bfac2d6dce90877f047604b34f8269820d7331..215b7068f548a67d96f11979393d4394f2d6fc1e 100644 (file)
@@ -6299,7 +6299,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) ?
@@ -6314,10 +6313,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;