Commit 3514da58 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Jens Axboe
Browse files

md/raid5: Make is_inactive_blocked() helper 



The logic to wait_for_stripe is difficult to parse being on so many
lines and with confusing operator precedence. Move it to a helper
function to make it easier to read.

No functional changes intended.

Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5165ed40

drivers/md/raid5.c

+19 −5
Original line number Diff line number Diff line
@@ -755,6 +755,24 @@ static bool has_failed(struct r5conf *conf) 
	return degraded > conf->max_degraded;

}



/*

 * Block until another thread clears R5_INACTIVE_BLOCKED or

 * there are fewer than 3/4 the maximum number of active stripes

 * and there is an inactive stripe available.

 */

static bool is_inactive_blocked(struct r5conf *conf, int hash)

{

	int active = atomic_read(&conf->active_stripes);



	if (list_empty(conf->inactive_list + hash))

		return false;



	if (!test_bit(R5_INACTIVE_BLOCKED, &conf->cache_state))

		return true;



	return active < (conf->max_nr_stripes * 3 / 4);

}



struct stripe_head *

raid5_get_active_stripe(struct r5conf *conf, sector_t sector,

			int previous, int noblock, int noquiesce)
@@ -796,11 +814,7 @@ raid5_get_active_stripe(struct r5conf *conf, sector_t sector, 
	set_bit(R5_INACTIVE_BLOCKED, &conf->cache_state);

	r5l_wake_reclaim(conf->log, 0);

	wait_event_lock_irq(conf->wait_for_stripe,

			    !list_empty(conf->inactive_list + hash) &&

			    (atomic_read(&conf->active_stripes)

				  < (conf->max_nr_stripes * 3 / 4)

				 || !test_bit(R5_INACTIVE_BLOCKED,

					      &conf->cache_state)),

			    is_inactive_blocked(conf, hash),

			    *(conf->hash_locks + hash));

	clear_bit(R5_INACTIVE_BLOCKED, &conf->cache_state);

	goto retry;