ext4: make ext4_mb_initialize_context return void
authorGuoqing Jiang <guoqing.jiang@linux.dev>
Fri, 2 Dec 2022 12:04:09 +0000 (20:04 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 9 Dec 2022 02:49:25 +0000 (21:49 -0500)
Change the return type to void since it always return 0, and no need
to do the checking in ext4_mb_new_blocks.

Signed-off-by: Guoqing Jiang <guoqing.jiang@linux.dev>
Reviewed-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
Link: https://lore.kernel.org/r/20221202120409.24098-1-guoqing.jiang@linux.dev
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/mballoc.c

index 9dad93059945b8e577987d88efc20d6455585f31..5b2ae37a8b80bcd43f0ec42982dd0e939d6ba31b 100644 (file)
@@ -5204,7 +5204,7 @@ static void ext4_mb_group_or_file(struct ext4_allocation_context *ac)
        mutex_lock(&ac->ac_lg->lg_mutex);
 }
 
-static noinline_for_stack int
+static noinline_for_stack void
 ext4_mb_initialize_context(struct ext4_allocation_context *ac,
                                struct ext4_allocation_request *ar)
 {
@@ -5253,8 +5253,6 @@ ext4_mb_initialize_context(struct ext4_allocation_context *ac,
                        (unsigned) ar->lleft, (unsigned) ar->pleft,
                        (unsigned) ar->lright, (unsigned) ar->pright,
                        inode_is_open_for_write(ar->inode) ? "" : "non-");
-       return 0;
-
 }
 
 static noinline_for_stack void
@@ -5591,11 +5589,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle,
                goto out;
        }
 
-       *errp = ext4_mb_initialize_context(ac, ar);
-       if (*errp) {
-               ar->len = 0;
-               goto out;
-       }
+       ext4_mb_initialize_context(ac, ar);
 
        ac->ac_op = EXT4_MB_HISTORY_PREALLOC;
        seq = this_cpu_read(discard_pa_seq);