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

Commit 5036805b authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] md: use correct size of raid5 stripe cache when measuring how full it is 



The raid5 stripe cache was recently changed from fixed size (NR_STRIPES) to
variable size (conf->max_nr_stripes).  However there are two places that still
use the constant and as a result, reducing the size of the stripe cache can
result in a deadlock.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3795bb0f

drivers/md/raid5.c

+4 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static inline void __release_stripe(raid5_conf_t *conf, struct stripe_head *sh) 
			list_add_tail(&sh->lru, &conf->inactive_list);

			atomic_dec(&conf->active_stripes);

			if (!conf->inactive_blocked ||

			    atomic_read(&conf->active_stripes) < (NR_STRIPES*3/4))

			    atomic_read(&conf->active_stripes) < (conf->max_nr_stripes*3/4))

				wake_up(&conf->wait_for_stripe);

		}

	}
@@ -264,7 +264,8 @@ static struct stripe_head *get_active_stripe(raid5_conf_t *conf, sector_t sector 
				conf->inactive_blocked = 1;

				wait_event_lock_irq(conf->wait_for_stripe,

						    !list_empty(&conf->inactive_list) &&

						    (atomic_read(&conf->active_stripes) < (NR_STRIPES *3/4)

						    (atomic_read(&conf->active_stripes)

						     < (conf->max_nr_stripes *3/4)

						     || !conf->inactive_blocked),

						    conf->device_lock,

						    unplug_slaves(conf->mddev);