Commit 44dd6161 authored by Chengguang Xu's avatar Chengguang Xu Committed by Jan Kara
Browse files

ext2: code cleanup for ext2_try_to_allocate() 

Code cleanup by removing duplicated code.

Link: https://lore.kernel.org/r/20191104114036.9893-4-cgxu519@mykernel.net


Signed-off-by: default avatarChengguang Xu <cgxu519@mykernel.net>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent ac3820f8

fs/ext2/balloc.c

+10 −19
Original line number Diff line number Diff line
@@ -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: