Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86c374ba authored by NeilBrown's avatar NeilBrown
Browse files

md/raid5: Remove stripe_head_state arg from handle_stripe_expansion. 



This arg is only used to differentiate between RAID5 and RAID6 but
that is not needed.  For RAID5, raid5_compute_sector will set qd_idx
to "~0" so j with certainly not equals qd_idx, so there is no need
for a guard on that condition.

So remove the guard and remove the arg from the declaration and
callers of handle_stripe_expansion.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Reviewed-by: default avatarNamhyung Kim <namhyung@gmail.com>
parent cc94015a

drivers/md/raid5.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -2921,8 +2921,7 @@ static void handle_parity_checks6(raid5_conf_t *conf, struct stripe_head *sh, 
	}

	}

}

}





static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh,

static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh)

				    struct stripe_head_state *r6s)

{

{

	int i;

	int i;
@@ -2964,7 +2963,7 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh, 
			set_bit(R5_UPTODATE, &sh2->dev[dd_idx].flags);

			set_bit(R5_UPTODATE, &sh2->dev[dd_idx].flags);

			for (j = 0; j < conf->raid_disks; j++)

			for (j = 0; j < conf->raid_disks; j++)

				if (j != sh2->pd_idx &&

				if (j != sh2->pd_idx &&

				    (!r6s || j != sh2->qd_idx) &&

				    j != sh2->qd_idx &&

				    !test_bit(R5_Expanded, &sh2->dev[j].flags))

				    !test_bit(R5_Expanded, &sh2->dev[j].flags))

					break;

					break;

			if (j == conf->raid_disks) {

			if (j == conf->raid_disks) {
@@ -3249,7 +3248,7 @@ static void handle_stripe5(struct stripe_head *sh, struct stripe_head_state *s) 




	if (s->expanding && s->locked == 0 &&

	if (s->expanding && s->locked == 0 &&

	    !test_bit(STRIPE_COMPUTE_RUN, &sh->state))

	    !test_bit(STRIPE_COMPUTE_RUN, &sh->state))

		handle_stripe_expansion(conf, sh, NULL);

		handle_stripe_expansion(conf, sh);

}

}





static void handle_stripe6(struct stripe_head *sh, struct stripe_head_state *s)

static void handle_stripe6(struct stripe_head *sh, struct stripe_head_state *s)
@@ -3512,7 +3511,7 @@ static void handle_stripe6(struct stripe_head *sh, struct stripe_head_state *s) 




	if (s->expanding && s->locked == 0 &&

	if (s->expanding && s->locked == 0 &&

	    !test_bit(STRIPE_COMPUTE_RUN, &sh->state))

	    !test_bit(STRIPE_COMPUTE_RUN, &sh->state))

		handle_stripe_expansion(conf, sh, s);

		handle_stripe_expansion(conf, sh);

}

}





static void handle_stripe(struct stripe_head *sh)

static void handle_stripe(struct stripe_head *sh)