Merge branch 'serge-next-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh...

[karo-tx-linux.git] / drivers / md / dm-table.c

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 3ba6a3859ce3c4957439ff3afdc4a5133bc2900b..50601ec7017acd3e310abedc9bb6c8ba45525344 100644 (file)
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -155,7 +155,6 @@ static int alloc_targets(struct dm_table *t, unsigned int num)
 {
        sector_t *n_highs;
        struct dm_target *n_targets;
-       int n = t->num_targets;
 
        /*
         * Allocate both the target array and offset array at once.
@@ -169,12 +168,7 @@ static int alloc_targets(struct dm_table *t, unsigned int num)
 
        n_targets = (struct dm_target *) (n_highs + num);
 
-       if (n) {
-               memcpy(n_highs, t->highs, sizeof(*n_highs) * n);
-               memcpy(n_targets, t->targets, sizeof(*n_targets) * n);
-       }
-
-       memset(n_highs + n, -1, sizeof(*n_highs) * (num - n));
+       memset(n_highs, -1, sizeof(*n_highs) * num);
        vfree(t->highs);
 
        t->num_allocated = num;
@@ -260,17 +254,6 @@ void dm_table_destroy(struct dm_table *t)
        kfree(t);
 }
 
-/*
- * Checks to see if we need to extend highs or targets.
- */
-static inline int check_space(struct dm_table *t)
-{
-       if (t->num_targets >= t->num_allocated)
-               return alloc_targets(t, t->num_allocated * 2);
-
-       return 0;
-}
-
 /*
  * See if we've already got a device in the list.
  */
@@ -731,8 +714,7 @@ int dm_table_add_target(struct dm_table *t, const char *type,
                return -EINVAL;
        }
 
-       if ((r = check_space(t)))
-               return r;
+       BUG_ON(t->num_targets >= t->num_allocated);
 
        tgt = t->targets + t->num_targets;
        memset(tgt, 0, sizeof(*tgt));
@@ -963,7 +945,7 @@ bool dm_table_request_based(struct dm_table *t)
        return dm_table_get_type(t) == DM_TYPE_REQUEST_BASED;
 }
 
-int dm_table_alloc_md_mempools(struct dm_table *t)
+static int dm_table_alloc_md_mempools(struct dm_table *t)
 {
        unsigned type = dm_table_get_type(t);
        unsigned per_bio_data_size = 0;
@@ -1636,6 +1618,25 @@ struct mapped_device *dm_table_get_md(struct dm_table *t)
 }
 EXPORT_SYMBOL(dm_table_get_md);
 
+void dm_table_run_md_queue_async(struct dm_table *t)
+{
+       struct mapped_device *md;
+       struct request_queue *queue;
+       unsigned long flags;
+
+       if (!dm_table_request_based(t))
+               return;
+
+       md = dm_table_get_md(t);
+       queue = dm_get_md_queue(md);
+       if (queue) {
+               spin_lock_irqsave(queue->queue_lock, flags);
+               blk_run_queue_async(queue);
+               spin_unlock_irqrestore(queue->queue_lock, flags);
+       }
+}
+EXPORT_SYMBOL(dm_table_run_md_queue_async);
+
 static int device_discard_capable(struct dm_target *ti, struct dm_dev *dev,
                                  sector_t start, sector_t len, void *data)
 {