Commit 95165e05 authored by Yu Kuai's avatar Yu Kuai Committed by openeuler-sync-bot
Browse files

md/raid10: fix improper BUG_ON() in raise_barrier() 

mainline inclusion
from mainline-v6.1-rc1
commit 4f350284
category: bugfix
bugzilla: 188015, https://gitee.com/openeuler/kernel/issues/I63WZE

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=4f350284a7306b3dff676caeafd3faf1b5c068d5



--------------------------------

'conf->barrier' is protected by 'conf->resync_lock', reading
'conf->barrier' without holding the lock is wrong.

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Acked-by: default avatarGuoqing Jiang <guoqing.jiang@linux.dev>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
(cherry picked from commit acd79c2c)
parent 64e25af6

drivers/md/raid10.c

+1 −1
Original line number Diff line number Diff line
@@ -941,8 +941,8 @@ static void flush_pending_writes(struct r10conf *conf) 


static void raise_barrier(struct r10conf *conf, int force)

{

	BUG_ON(force && !conf->barrier);

	spin_lock_irq(&conf->resync_lock);

	BUG_ON(force && !conf->barrier);



	/* Wait until no block IO is waiting (unless 'force') */

	wait_event_lock_irq(conf->wait_barrier, force || !conf->nr_waiting,