Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Chengguang Xu <cgxu519@mykernel.net>
To:     jack@suse.com
Cc:     linux-ext4@vger.kernel.org, Chengguang Xu <cgxu519@mykernel.net>
Message-ID: <20191104114036.9893-4-cgxu519@mykernel.net>
Subject: [PATCH 4/5] ext2: code cleanup for ext2_try_to_allocate()
Date:   Mon,  4 Nov 2019 19:40:35 +0800
In-Reply-To: <20191104114036.9893-1-cgxu519@mykernel.net>
References: <20191104114036.9893-1-cgxu519@mykernel.net>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf8
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk

Code cleanup by removing duplicated code.

Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
---
 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 grou=
p,
 =09=09=09=09;
 =09=09}
 =09}
-=09start =3D grp_goal;
=20
-repeat:
-=09if (ext2_set_bit_atomic(sb_bgl_lock(EXT2_SB(sb), group), grp_goal,
-=09=09=09       =09=09=09=09bitmap_bh->b_data)) {
-=09=09/*
-=09=09 * The block was allocated by another thread, or it was
-=09=09 * allocated and then freed by another thread
-=09=09 */
-=09=09start++;
-=09=09grp_goal++;
-=09=09if (start >=3D end)
-=09=09=09goto fail_access;
-=09=09goto repeat;
-=09}
-=09num++;
-=09grp_goal++;
-=09while (num < *count && grp_goal < end
-=09=09&& !ext2_set_bit_atomic(sb_bgl_lock(EXT2_SB(sb), group),
+=09while (num < *count && grp_goal < end) {
+=09=09if (ext2_set_bit_atomic(sb_bgl_lock(EXT2_SB(sb), group),
 =09=09=09=09=09grp_goal, bitmap_bh->b_data)) {
+=09=09=09if (num =3D=3D 0) {
+=09=09=09=09grp_goal++;
+=09=09=09=09continue;
+=09=09=09} else {
+=09=09=09=09break;
+=09=09=09}
+=09=09}
+
 =09=09num++;
 =09=09grp_goal++;
 =09}
+
+=09if (!num)
+=09=09goto fail_access;
+
 =09*count =3D num;
 =09return grp_goal - num;
 fail_access:
--=20
2.20.1