Skip to contentSkip to conversation

ext4: make ext4_mb_initialize_context return void

PATCH New Guoqing Jiang 1 participant 1 message Dec 2, 2022 ext4 file system

lore
Share & tools
lore

Guoqing Jiang

author
#0 lore raw

PATCH v2 1/1 ext4: make ext4_mb_initialize_context return void

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 <[email protected]>
Reviewed-by Ojaswin Mujoo <[email protected]>

---
V2 changes:
1. collect tag from Ojaswin, thanks!

 fs/ext4/mballoc.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
fs/ext4/mballoc.c +2 -8
index 9dad93059945..5b2ae37a8b80 100644
@@ -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);
Signature · 1 line
2.35.3