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

md: factor out a mddev_find_locked helper from mddev_find 

Factor out a self-contained helper to just lookup a mddev by the dev_t
"unit".

Cc: stable@vger.kernel.org
Reviewed-by: Heming Zhao <heming.zhao@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Song Liu <song@kernel.org>
This commit is contained in:
Christoph Hellwig 2021-04-03 18:15:28 +02:00 committed by Song Liu
parent 6a4db2a603
commit 8b57251f9a
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/md/md.c
View File

@ -734,6 +734,17 @@ void mddev_init(struct mddev *mddev)
} }
EXPORT_SYMBOL_GPL(mddev_init); EXPORT_SYMBOL_GPL(mddev_init);
static struct mddev *mddev_find_locked(dev_t unit)
{
struct mddev *mddev;
list_for_each_entry(mddev, &all_mddevs, all_mddevs)
if (mddev->unit == unit)
return mddev;
return NULL;
}
static struct mddev *mddev_find(dev_t unit) static struct mddev *mddev_find(dev_t unit)
{ {
struct mddev *mddev, *new = NULL; struct mddev *mddev, *new = NULL;
@ -745,13 +756,13 @@ static struct mddev *mddev_find(dev_t unit)
spin_lock(&all_mddevs_lock); spin_lock(&all_mddevs_lock);
if (unit) { if (unit) {
list_for_each_entry(mddev, &all_mddevs, all_mddevs) mddev = mddev_find_locked(unit);
if (mddev->unit == unit) { if (mddev) {
mddev_get(mddev); mddev_get(mddev);
spin_unlock(&all_mddevs_lock); spin_unlock(&all_mddevs_lock);
kfree(new); kfree(new);
return mddev; return mddev;
} }
if (new) { if (new) {
list_add(&new->all_mddevs, &all_mddevs); list_add(&new->all_mddevs, &all_mddevs);
@ -777,12 +788,7 @@ static struct mddev *mddev_find(dev_t unit)
return NULL; return NULL;
} }
is_free = 1; is_free = !mddev_find_locked(dev);
list_for_each_entry(mddev, &all_mddevs, all_mddevs)
if (mddev->unit == dev) {
is_free = 0;
break;
}
} }
new->unit = dev; new->unit = dev;
new->md_minor = MINOR(dev); new->md_minor = MINOR(dev);