[PATCH] dm: tidy mdptr

Change dm_get_mdptr() to take a struct mapped_device instead of dev_t.

Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 13 insertions, 3 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)