[PATCH 4/4] raid5: fix wakeup condition
From: Shaohua Li <hidden>
Date: 2015-05-29 00:33:48
Subsystem:
software raid (multiple disks) support, the rest · Maintainers:
Song Liu, Yu Kuai, Linus Torvalds
Since we have several stripe hash list, the conf->active_stripes doesn't determine if there is free stripe in a specific hash list, so delete the check. After this, the R5_INACTIVE_BLOCKED check is inappropriate. There is no point not to wakeup a task if there is free stripe. Signed-off-by: Shaohua Li <redacted> --- drivers/md/raid5.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 67626f3..4b5a03c 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c@@ -687,11 +687,7 @@ get_active_stripe(struct r5conf *conf, sector_t sector, &conf->cache_state); 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)), + !list_empty(conf->inactive_list + hash), *(conf->hash_locks + hash)); clear_bit(R5_INACTIVE_BLOCKED, &conf->cache_state);
--
1.8.1