On Mon 04-11-19 19:40:35, Chengguang Xu wrote:
> Code cleanup by removing duplicated code.
>
> Signed-off-by: Chengguang Xu <cgxu519@xxxxxxxxxxxx>
Thanks for the patch! I've merged it with a small update to switch the
while() loop into a for() loop which is somewhat more natural in that
situation. Resulting patch attached.
Honza
> ---
> fs/ext2/balloc.c | 32 ++++++++++++++------------------
> 1 file changed, 14 insertions(+), 18 deletions(-)
>
> diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
> index a0c22e166682..9a9bd566243d 100644
> --- a/fs/ext2/balloc.c
> +++ b/fs/ext2/balloc.c
> @@ -710,29 +710,25 @@ ext2_try_to_allocate(struct super_block *sb, int group,
> ;
> }
> }
> - start = grp_goal;
>
> -repeat:
> - if (ext2_set_bit_atomic(sb_bgl_lock(EXT2_SB(sb), group), grp_goal,
> - bitmap_bh->b_data)) {
> - /*
> - * The block was allocated by another thread, or it was
> - * allocated and then freed by another thread
> - */
> - start++;
> - grp_goal++;
> - if (start >= end)
> - goto fail_access;
> - goto repeat;
> - }
> - num++;
> - grp_goal++;
> - while (num < *count && grp_goal < end
> - && !ext2_set_bit_atomic(sb_bgl_lock(EXT2_SB(sb), group),
> + while (num < *count && grp_goal < end) {
> + if (ext2_set_bit_atomic(sb_bgl_lock(EXT2_SB(sb), group),
> grp_goal, bitmap_bh->b_data)) {
> + if (num == 0) {
> + grp_goal++;
> + continue;
> + } else {
> + break;
> + }
> + }
> +
> num++;
> grp_goal++;
> }
> +
> + if (!num)
> + goto fail_access;
> +
> *count = num;
> return grp_goal - num;
> fail_access:
> --
> 2.20.1
>
>
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
>From d61650c669a6e3c1347cd3b333e4ae8487757f35 Mon Sep 17 00:00:00 2001
From: Chengguang Xu <cgxu519@xxxxxxxxxxxx>
Date: Mon, 4 Nov 2019 19:40:35 +0800
Subject: [PATCH] ext2: code cleanup for ext2_try_to_allocate()
Code cleanup by removing duplicated code.
Link: https://lore.kernel.org/r/20191104114036.9893-4-cgxu519@xxxxxxxxxxxx
Signed-off-by: Chengguang Xu <cgxu519@xxxxxxxxxxxx>
Signed-off-by: Jan Kara <jack@xxxxxxx>
---
fs/ext2/balloc.c | 29 ++++++++++-------------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
index 25bc3a43cd94..d67f7dc1baaa 100644
--- a/fs/ext2/balloc.c
+++ b/fs/ext2/balloc.c
@@ -698,29 +698,20 @@ ext2_try_to_allocate(struct super_block *sb, int group,
;
}
}
- start = grp_goal;
-repeat:
- if (ext2_set_bit_atomic(sb_bgl_lock(EXT2_SB(sb), group), grp_goal,
- bitmap_bh->b_data)) {
- /*
- * The block was allocated by another thread, or it was
- * allocated and then freed by another thread
- */
- start++;
- grp_goal++;
- if (start >= end)
- goto fail_access;
- goto repeat;
- }
- num++;
- grp_goal++;
- while (num < *count && grp_goal < end
- && !ext2_set_bit_atomic(sb_bgl_lock(EXT2_SB(sb), group),
+ for (; num < *count && grp_goal < end; grp_goal++) {
+ if (ext2_set_bit_atomic(sb_bgl_lock(EXT2_SB(sb), group),
grp_goal, bitmap_bh->b_data)) {
+ if (num == 0)
+ continue;
+ break;
+ }
num++;
- grp_goal++;
}
+
+ if (num == 0)
+ goto fail_access;
+
*count = num;
return grp_goal - num;
fail_access:
--
2.16.4
