From 49de5769702cdf997e87359ba4e9ae289c1044e0 Mon Sep 17 00:00:00 2001 From: Mike Snitzer Date: Mon, 6 Nov 2017 16:40:10 -0500 Subject: dm: small cleanup in dm_get_md() Makes dm_get_md() and dm_get_from_kobject() have similar code. Signed-off-by: Mike Snitzer --- drivers/md/dm.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'drivers/md') diff --git a/drivers/md/dm.c b/drivers/md/dm.c index dcfa1a8c9390..567b9ed1056d 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2074,17 +2074,12 @@ struct mapped_device *dm_get_md(dev_t dev) spin_lock(&_minor_lock); md = idr_find(&_minor_idr, minor); - if (md) { - if ((md == MINOR_ALLOCED || - (MINOR(disk_devt(dm_disk(md))) != minor) || - dm_deleting_md(md) || - test_bit(DMF_FREEING, &md->flags))) { - md = NULL; - goto out; - } - dm_get(md); + if (!md || md == MINOR_ALLOCED || (MINOR(disk_devt(dm_disk(md))) != minor) || + test_bit(DMF_FREEING, &md->flags) || dm_deleting_md(md)) { + md = NULL; + goto out; } - + dm_get(md); out: spin_unlock(&_minor_lock); -- cgit