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

Commit df10cfbc authored by Dan Williams's avatar Dan Williams
Browse files

md: do not progress the resync process if the stripe was blocked 



handle_stripe will take no action on a stripe when waiting for userspace
to unblock the array, so do not report completed sectors.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d8e64406

drivers/md/raid5.c

+13 −6
Original line number Diff line number Diff line
@@ -2507,7 +2507,7 @@ static void handle_stripe_expansion(raid5_conf_t *conf, struct stripe_head *sh, 
 *

 */



static void handle_stripe5(struct stripe_head *sh)

static bool handle_stripe5(struct stripe_head *sh)

{

	raid5_conf_t *conf = sh->raid_conf;

	int disks = sh->disks, i;
@@ -2755,9 +2755,11 @@ static void handle_stripe5(struct stripe_head *sh) 
	ops_run_io(sh, &s);



	return_io(return_bi);



	return blocked_rdev == NULL;

}



static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page)

static bool handle_stripe6(struct stripe_head *sh, struct page *tmp_page)

{

	raid6_conf_t *conf = sh->raid_conf;

	int disks = sh->disks;
@@ -2968,14 +2970,17 @@ static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page) 
	ops_run_io(sh, &s);



	return_io(return_bi);



	return blocked_rdev == NULL;

}



static void handle_stripe(struct stripe_head *sh, struct page *tmp_page)

/* returns true if the stripe was handled */

static bool handle_stripe(struct stripe_head *sh, struct page *tmp_page)

{

	if (sh->raid_conf->level == 6)

		handle_stripe6(sh, tmp_page);

		return handle_stripe6(sh, tmp_page);

	else

		handle_stripe5(sh);

		return handle_stripe5(sh);

}
@@ -3691,7 +3696,9 @@ static inline sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *ski 
	clear_bit(STRIPE_INSYNC, &sh->state);

	spin_unlock(&sh->lock);



	handle_stripe(sh, NULL);

	/* wait for any blocked device to be handled */

	while(unlikely(!handle_stripe(sh, NULL)))

		;

	release_stripe(sh);



	return STRIPE_SECTORS;