dm table: remove unused buggy code that extends the targets array

[uclinux-h8/linux.git] / drivers / md / dm-table.c

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 3ba6a38..6a7f2b8 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;
@@ -261,17 +255,6 @@ void dm_table_destroy(struct dm_table *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.
  */
 static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)
@@ -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));