diff options
| author |   Yu Kuai <yukuai3@huawei.com> | 2023-09-27 14:12:40 +0800 |
|---|---|---|
| committer |   Song Liu <song@kernel.org> | 2023-09-27 13:54:26 -0700 |
| commit | 3d8d32873c7b6d9cec5b40c2ddb8c7c55961694f (patch) | |
| tree | 7417899cdafefbece9c95fbc363d464345e27c81 | |
| parent | md: replace deprecated strncpy with memcpy (diff) | |
| download | wireguard-linux-3d8d32873c7b6d9cec5b40c2ddb8c7c55961694f.tar.xz wireguard-linux-3d8d32873c7b6d9cec5b40c2ddb8c7c55961694f.zip | |
md: factor out a helper from mddev_put()
There are no functional changes, prepare to simplify md_seq_ops in next
patch.
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20230927061241.1552837-2-yukuai1@huaweicloud.com
| -rw-r--r-- | drivers/md/md.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 76e2cf609883..aad91cd72a06 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -616,23 +616,28 @@ static inline struct mddev *mddev_get(struct mddev *mddev) static void mddev_delayed_delete(struct work_struct *ws); +static void __mddev_put(struct mddev *mddev) +{ + if (mddev->raid_disks || !list_empty(&mddev->disks) || + mddev->ctime || mddev->hold_active) + return; + + /* Array is not configured at all, and not held active, so destroy it */ + set_bit(MD_DELETED, &mddev->flags); + + /* + * Call queue_work inside the spinlock so that flush_workqueue() after + * mddev_find will succeed in waiting for the work to be done. + */ + queue_work(md_misc_wq, &mddev->del_work); +} + void mddev_put(struct mddev *mddev) { if (!atomic_dec_and_lock(&mddev->active, &all_mddevs_lock)) return; - if (!mddev->raid_disks && list_empty(&mddev->disks) && - mddev->ctime == 0 && !mddev->hold_active) { - /* Array is not configured at all, and not held active, - * so destroy it */ - set_bit(MD_DELETED, &mddev->flags); - /* - * Call queue_work inside the spinlock so that - * flush_workqueue() after mddev_find will succeed in waiting - * for the work to be done. - */ - queue_work(md_misc_wq, &mddev->del_work); - } + __mddev_put(mddev); spin_unlock(&all_mddevs_lock); } |