[PATCH] dm table: store md

[linux-2.6-omap-h63xx.git] / drivers / md / dm-ioctl.c

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 561bda5011e00e07f2d0a80e8aa5d147f81cd023..65826bdac00c7b3649c4815690cf64fc0d2faac2 100644 (file)
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -244,9 +244,9 @@ static void __hash_remove(struct hash_cell *hc)
                dm_table_put(table);
        }
 
-       dm_put(hc->md);
        if (hc->new_map)
                dm_table_put(hc->new_map);
+       dm_put(hc->md);
        free_cell(hc);
 }
 
@@ -598,17 +598,27 @@ static int dev_create(struct dm_ioctl *param, size_t param_size)
 /*
  * Always use UUID for lookups if it's present, otherwise use name or dev.
  */
-static inline struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param)
+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 inline struct mapped_device *find_device(struct dm_ioctl *param)
+static struct mapped_device *find_device(struct dm_ioctl *param)
 {
        struct hash_cell *hc;
        struct mapped_device *md = NULL;
@@ -975,33 +985,43 @@ static int table_load(struct dm_ioctl *param, size_t param_size)
        int r;
        struct hash_cell *hc;
        struct dm_table *t;
+       struct mapped_device *md;
 
-       r = dm_table_create(&t, get_mode(param), param->target_count);
+       md = find_device(param);
+       if (!md)
+               return -ENXIO;
+
+       r = dm_table_create(&t, get_mode(param), param->target_count, md);
        if (r)
-               return r;
+               goto out;
 
        r = populate_table(t, param, param_size);
        if (r) {
                dm_table_put(t);
-               return r;
+               goto out;
        }
 
        down_write(&_hash_lock);
-       hc = __find_device_hash_cell(param);
-       if (!hc) {
-               DMWARN("device doesn't appear to be in the dev hash table.");
-               up_write(&_hash_lock);
+       hc = dm_get_mdptr(md);
+       if (!hc || hc->md != md) {
+               DMWARN("device has been removed from the dev hash table.");
                dm_table_put(t);
-               return -ENXIO;
+               up_write(&_hash_lock);
+               r = -ENXIO;
+               goto out;
        }
 
        if (hc->new_map)
                dm_table_put(hc->new_map);
        hc->new_map = t;
+       up_write(&_hash_lock);
+
        param->flags |= DM_INACTIVE_PRESENT_FLAG;
+       r = __dev_status(md, param);
+
+out:
+       dm_put(md);
 
-       r = __dev_status(hc->md, param);
-       up_write(&_hash_lock);
        return r;
 }
 
@@ -1359,16 +1379,11 @@ static int ctl_ioctl(struct inode *inode, struct file *file,
         * Copy the parameters into kernel space.
         */
        r = copy_params(user, &param);
-       if (r) {
-               current->flags &= ~PF_MEMALLOC;
-               return r;
-       }
 
-       /*
-        * FIXME: eventually we will remove the PF_MEMALLOC flag
-        * here.  However the tools still do nasty things like
-        * 'load' while a device is suspended.
-        */
+       current->flags &= ~PF_MEMALLOC;
+
+       if (r)
+               return r;
 
        r = validate_params(cmd, param);
        if (r)
@@ -1386,7 +1401,6 @@ static int ctl_ioctl(struct inode *inode, struct file *file,
 
  out:
        free_params(param);
-       current->flags &= ~PF_MEMALLOC;
        return r;
 }