Commit a7ede3d1 authored Nov 27, 2019 by Guoqing Jiang Committed by Song Liu Dec 11, 2019

raid5: need to set STRIPE_HANDLE for batch head



With commit 6ce220dd ("raid5: don't set
STRIPE_HANDLE to stripe which is in batch list"), we don't want to set
STRIPE_HANDLE flag for sh which is already in batch list.

However, the stripe which is the head of batch list should set this flag,
otherwise panic could happen inside init_stripe at BUG_ON(sh->batch_head),
it is reproducible with raid5 on top of nvdimm devices per Xiao oberserved.

Thanks for Xiao's effort to verify the change.

Fixes: 6ce220dd ("raid5: don't set STRIPE_HANDLE to stripe which is in batch list")
Reported-by: Xiao Ni <xni@redhat.com>
Tested-by: Xiao Ni <xni@redhat.com>
Signed-off-by: Guoqing Jiang <guoqing.jiang@cloud.ionos.com>
Signed-off-by: Song Liu <songliubraving@fb.com>

parent cc90bc68

drivers/md/raid5.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5726,7 +5726,7 @@ static bool raid5_make_request(struct mddev mddev, struct bio bi)
		do_flush = false;
		}

		if (!sh->batch_head)
		if (!sh->batch_head \|\| sh == sh->batch_head)
		set_bit(STRIPE_HANDLE, &sh->state);
		clear_bit(STRIPE_DELAYED, &sh->state);
		if ((!sh->batch_head \|\| sh == sh->batch_head) &&

Admin message