3 files changed, 16 insertions, 12 deletions

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 442e2be6052e..0693b6f54b7d 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -600,12 +600,22 @@ static int dev_create(struct dm_ioctl *param, size_t param_size)
  */
 static struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param)
 {
+        struct mapped_device *md;
+        void *mdptr = NULL;
+
         if (*param->uuid)
                 return __get_uuid_cell(param->uuid);
-        else if (*param->name)
+
+        if (*param->name)
                 return __get_name_cell(param->name);
-        else
-                return dm_get_mdptr(huge_decode_dev(param->dev));
+
+        md = dm_get_md(huge_decode_dev(param->dev));
+        if (md) {
+                mdptr = dm_get_mdptr(md);
+                dm_put(md);
+        }
+
+        return mdptr;
 }
 
 static struct mapped_device *find_device(struct dm_ioctl *param)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index f140d499602a..3d121cbc2fde 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -990,15 +990,9 @@ struct mapped_device *dm_get_md(dev_t dev)
         return md;
 }
 
-void *dm_get_mdptr(dev_t dev)
+void *dm_get_mdptr(struct mapped_device *md)
 {
-        struct mapped_device *md;
-        void *mdptr = NULL;
-
-        md = dm_find_md(dev);
-        if (md)
-                mdptr = md->interface_ptr;
-        return mdptr;
+        return md->interface_ptr;
 }
 
 void dm_set_mdptr(struct mapped_device *md, void *ptr)
diff --git a/drivers/md/dm.h b/drivers/md/dm.h
index 0ff11d6f8158..17ffa8d671a7 100644
--- a/drivers/md/dm.h
+++ b/drivers/md/dm.h
@@ -47,7 +47,7 @@ struct mapped_device;
 int dm_create(struct mapped_device **md);
 int dm_create_with_minor(unsigned int minor, struct mapped_device **md);
 void dm_set_mdptr(struct mapped_device *md, void *ptr);
-void *dm_get_mdptr(dev_t dev);
+void *dm_get_mdptr(struct mapped_device *md);
 struct mapped_device *dm_get_md(dev_t dev);
 
 /*