Commit 7184ef8b authored by Shaohua Li's avatar Shaohua Li

MD: fix sleep in atomic

bioset_free() will take a mutex, so can't get called with spinlock hold.

Fix: 5a85071c(md: use a separate bio_set for synchronous IO.)
Cc: NeilBrown <neilb@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 7f053a6a
...@@ -475,6 +475,8 @@ static void mddev_delayed_delete(struct work_struct *ws); ...@@ -475,6 +475,8 @@ static void mddev_delayed_delete(struct work_struct *ws);
static void mddev_put(struct mddev *mddev) static void mddev_put(struct mddev *mddev)
{ {
struct bio_set *bs = NULL, *sync_bs = NULL;
if (!atomic_dec_and_lock(&mddev->active, &all_mddevs_lock)) if (!atomic_dec_and_lock(&mddev->active, &all_mddevs_lock))
return; return;
if (!mddev->raid_disks && list_empty(&mddev->disks) && if (!mddev->raid_disks && list_empty(&mddev->disks) &&
...@@ -482,10 +484,8 @@ static void mddev_put(struct mddev *mddev) ...@@ -482,10 +484,8 @@ static void mddev_put(struct mddev *mddev)
/* Array is not configured at all, and not held active, /* Array is not configured at all, and not held active,
* so destroy it */ * so destroy it */
list_del_init(&mddev->all_mddevs); list_del_init(&mddev->all_mddevs);
if (mddev->bio_set) bs = mddev->bio_set;
bioset_free(mddev->bio_set); sync_bs = mddev->sync_set;
if (mddev->sync_set)
bioset_free(mddev->sync_set);
mddev->bio_set = NULL; mddev->bio_set = NULL;
mddev->sync_set = NULL; mddev->sync_set = NULL;
if (mddev->gendisk) { if (mddev->gendisk) {
...@@ -500,6 +500,10 @@ static void mddev_put(struct mddev *mddev) ...@@ -500,6 +500,10 @@ static void mddev_put(struct mddev *mddev)
kfree(mddev); kfree(mddev);
} }
spin_unlock(&all_mddevs_lock); spin_unlock(&all_mddevs_lock);
if (bs)
bioset_free(bs);
if (sync_bs)
bioset_free(sync_bs);
} }
static void md_safemode_timeout(unsigned long data); static void md_safemode_timeout(unsigned long data);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment