md/raid5: remove condition test from check_break_stripe_batch_list. (4e3d62ff) · Commits · 戴 / test

handle_stripe_clean_event() contains a chunk of code very similar to check_break_stripe_batch_list(). If we make the latter more like the former, we can end up with just one copy of this code. This first step removed the condition (and the 'check_') part of the name. This has the added advantage of making it clear what check is being performed at the point where the function is called. Signed-off-by:

NeilBrown <neilb@suse.de>

drivers/md/raid5.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -4234,16 +4234,11 @@ static int clear_batch_ready(struct stripe_head *sh)
		return 0;
		}

		static void check_break_stripe_batch_list(struct stripe_head *sh)
		static void break_stripe_batch_list(struct stripe_head *head_sh)
		{
		struct stripe_head head_sh, next;
		struct stripe_head sh, next;
		int i;

		if (!test_and_clear_bit(STRIPE_BATCH_ERR, &sh->state))
		return;

		head_sh = sh;

		list_for_each_entry_safe(sh, next, &head_sh->batch_list, batch_list) {

		list_del_init(&sh->batch_list);
		@@ -4290,7 +4285,8 @@ static void handle_stripe(struct stripe_head *sh)
		return;
		}

		check_break_stripe_batch_list(sh);
		if (test_and_clear_bit(STRIPE_BATCH_ERR, &sh->state))
		break_stripe_batch_list(sh);

		if (test_bit(STRIPE_SYNC_REQUESTED, &sh->state) && !sh->batch_head) {
		spin_lock(&sh->stripe_lock);

Admin message