diff options
author | Shaohua Li <shli@fb.com> | 2017-07-03 17:34:23 -0400 |
---|---|---|
committer | Shaohua Li <shli@fb.com> | 2017-07-03 17:38:59 -0400 |
commit | 7184ef8bab0cb865c3cea9dd1a675771145df0af (patch) | |
tree | 2c356cf60b64c32d4ad39e434a9759f14e2ba287 | |
parent | 7f053a6a745557b3f3ad63e9d28ba85c3c0b1563 (diff) |
MD: fix sleep in atomic
bioset_free() will take a mutex, so can't get called with spinlock hold.
Fix: 5a85071c2cbc(md: use a separate bio_set for synchronous IO.)
Cc: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
-rw-r--r-- | drivers/md/md.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 092b48f8095e..66f6b928a80b 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -475,6 +475,8 @@ static void mddev_delayed_delete(struct work_struct *ws); | |||
475 | 475 | ||
476 | static void mddev_put(struct mddev *mddev) | 476 | static void mddev_put(struct mddev *mddev) |
477 | { | 477 | { |
478 | struct bio_set *bs = NULL, *sync_bs = NULL; | ||
479 | |||
478 | if (!atomic_dec_and_lock(&mddev->active, &all_mddevs_lock)) | 480 | if (!atomic_dec_and_lock(&mddev->active, &all_mddevs_lock)) |
479 | return; | 481 | return; |
480 | if (!mddev->raid_disks && list_empty(&mddev->disks) && | 482 | if (!mddev->raid_disks && list_empty(&mddev->disks) && |
@@ -482,10 +484,8 @@ static void mddev_put(struct mddev *mddev) | |||
482 | /* Array is not configured at all, and not held active, | 484 | /* Array is not configured at all, and not held active, |
483 | * so destroy it */ | 485 | * so destroy it */ |
484 | list_del_init(&mddev->all_mddevs); | 486 | list_del_init(&mddev->all_mddevs); |
485 | if (mddev->bio_set) | 487 | bs = mddev->bio_set; |
486 | bioset_free(mddev->bio_set); | 488 | sync_bs = mddev->sync_set; |
487 | if (mddev->sync_set) | ||
488 | bioset_free(mddev->sync_set); | ||
489 | mddev->bio_set = NULL; | 489 | mddev->bio_set = NULL; |
490 | mddev->sync_set = NULL; | 490 | mddev->sync_set = NULL; |
491 | if (mddev->gendisk) { | 491 | if (mddev->gendisk) { |
@@ -500,6 +500,10 @@ static void mddev_put(struct mddev *mddev) | |||
500 | kfree(mddev); | 500 | kfree(mddev); |
501 | } | 501 | } |
502 | spin_unlock(&all_mddevs_lock); | 502 | spin_unlock(&all_mddevs_lock); |
503 | if (bs) | ||
504 | bioset_free(bs); | ||
505 | if (sync_bs) | ||
506 | bioset_free(sync_bs); | ||
503 | } | 507 | } |
504 | 508 | ||
505 | static void md_safemode_timeout(unsigned long data); | 509 | static void md_safemode_timeout(unsigned long data); |