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

Commit fab363b5 authored by Shaohua Li's avatar Shaohua Li Committed by NeilBrown
Browse files

raid5: delayed stripe fix 



There isn't locking setting STRIPE_DELAYED and STRIPE_PREREAD_ACTIVE bits, but
the two bits have relationship. A delayed stripe can be moved to hold list only
when preread active stripe count is below IO_THRESHOLD. If a stripe has both
the bits set, such stripe will be in delayed list and preread count not 0,
which will make such stripe never leave delayed list.

Signed-off-by: default avatarShaohua Li <shli@fusionio.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 2e8ac303

drivers/md/raid5.c

+3 −1
Original line number Diff line number Diff line
@@ -196,12 +196,14 @@ static void __release_stripe(struct r5conf *conf, struct stripe_head *sh) 
		BUG_ON(!list_empty(&sh->lru));

		BUG_ON(atomic_read(&conf->active_stripes)==0);

		if (test_bit(STRIPE_HANDLE, &sh->state)) {

			if (test_bit(STRIPE_DELAYED, &sh->state))

			if (test_bit(STRIPE_DELAYED, &sh->state) &&

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

				list_add_tail(&sh->lru, &conf->delayed_list);

			else if (test_bit(STRIPE_BIT_DELAY, &sh->state) &&

				   sh->bm_seq - conf->seq_write > 0)

				list_add_tail(&sh->lru, &conf->bitmap_list);

			else {

				clear_bit(STRIPE_DELAYED, &sh->state);

				clear_bit(STRIPE_BIT_DELAY, &sh->state);

				list_add_tail(&sh->lru, &conf->handle_list);

			}