UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

md/raid10: don't modify 'nr_waitng' in wait_barrier() for the case nowait 

For the case nowait in wait_barrier(), there is no point to increase
nr_waiting and then decrease it.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Acked-by: Guoqing Jiang <guoqing.jiang@linux.dev>
Signed-off-by: Song Liu <song@kernel.org>
This commit is contained in:
Yu Kuai 2022-09-16 19:34:25 +08:00 committed by Song Liu
parent ed2e063f92
commit 0de57e541b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/md/raid10.c
View File

@ -990,17 +990,17 @@ static bool wait_barrier(struct r10conf *conf, bool nowait)
spin_lock_irq(&conf->resync_lock); spin_lock_irq(&conf->resync_lock);
if (conf->barrier) { if (conf->barrier) {
conf->nr_waiting++;
/* Return false when nowait flag is set */ /* Return false when nowait flag is set */
if (nowait) { if (nowait) {
ret = false; ret = false;
} else { } else {
conf->nr_waiting++;
raid10_log(conf->mddev, "wait barrier"); raid10_log(conf->mddev, "wait barrier");
wait_event_lock_irq(conf->wait_barrier, wait_event_lock_irq(conf->wait_barrier,
stop_waiting_barrier(conf), stop_waiting_barrier(conf),
conf->resync_lock); conf->resync_lock);
conf->nr_waiting--;
} }
conf->nr_waiting--;
if (!conf->nr_waiting) if (!conf->nr_waiting)
wake_up(&conf->wait_barrier); wake_up(&conf->wait_barrier);
} }