diff options
-rw-r--r-- | drivers/md/dm.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index ec1444f49de1..73f28802dc7a 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
@@ -2571,7 +2571,7 @@ int dm_setup_md_queue(struct mapped_device *md) | |||
2571 | return 0; | 2571 | return 0; |
2572 | } | 2572 | } |
2573 | 2573 | ||
2574 | static struct mapped_device *dm_find_md(dev_t dev) | 2574 | struct mapped_device *dm_get_md(dev_t dev) |
2575 | { | 2575 | { |
2576 | struct mapped_device *md; | 2576 | struct mapped_device *md; |
2577 | unsigned minor = MINOR(dev); | 2577 | unsigned minor = MINOR(dev); |
@@ -2582,12 +2582,15 @@ static struct mapped_device *dm_find_md(dev_t dev) | |||
2582 | spin_lock(&_minor_lock); | 2582 | spin_lock(&_minor_lock); |
2583 | 2583 | ||
2584 | md = idr_find(&_minor_idr, minor); | 2584 | md = idr_find(&_minor_idr, minor); |
2585 | if (md && (md == MINOR_ALLOCED || | 2585 | if (md) { |
2586 | (MINOR(disk_devt(dm_disk(md))) != minor) || | 2586 | if ((md == MINOR_ALLOCED || |
2587 | dm_deleting_md(md) || | 2587 | (MINOR(disk_devt(dm_disk(md))) != minor) || |
2588 | test_bit(DMF_FREEING, &md->flags))) { | 2588 | dm_deleting_md(md) || |
2589 | md = NULL; | 2589 | test_bit(DMF_FREEING, &md->flags))) { |
2590 | goto out; | 2590 | md = NULL; |
2591 | goto out; | ||
2592 | } | ||
2593 | dm_get(md); | ||
2591 | } | 2594 | } |
2592 | 2595 | ||
2593 | out: | 2596 | out: |
@@ -2595,16 +2598,6 @@ out: | |||
2595 | 2598 | ||
2596 | return md; | 2599 | return md; |
2597 | } | 2600 | } |
2598 | |||
2599 | struct mapped_device *dm_get_md(dev_t dev) | ||
2600 | { | ||
2601 | struct mapped_device *md = dm_find_md(dev); | ||
2602 | |||
2603 | if (md) | ||
2604 | dm_get(md); | ||
2605 | |||
2606 | return md; | ||
2607 | } | ||
2608 | EXPORT_SYMBOL_GPL(dm_get_md); | 2601 | EXPORT_SYMBOL_GPL(dm_get_md); |
2609 | 2602 | ||
2610 | void *dm_get_mdptr(struct mapped_device *md) | 2603 | void *dm_get_mdptr(struct mapped_device *md) |