mirror of
https://github.com/torvalds/linux.git
synced 2026-06-07 14:04:54 +02:00
md: factor out a mddev_find_locked helper from mddev_find
commit 8b57251f9a upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
07e7374085
commit
cdcfa77a33
|
|
@ -748,6 +748,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;
|
struct mddev *mddev;
|
||||||
|
|
@ -775,8 +786,8 @@ static struct mddev *mddev_find_or_alloc(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);
|
||||||
|
|
@ -807,12 +818,7 @@ static struct mddev *mddev_find_or_alloc(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);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user