vserver 1.9.3

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

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 87df3e9..a6c2484 100644 (file)
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -181,8 +181,8 @@ static int alloc_targets(struct dm_table *t, unsigned int num)
        /*
         * Allocate both the target array and offset array at once.
         */
-       n_highs = (sector_t *) dm_vcalloc(sizeof(struct dm_target) +
-                                         sizeof(sector_t), num);
+       n_highs = (sector_t *) dm_vcalloc(num, sizeof(struct dm_target) +
+                                         sizeof(sector_t));
        if (!n_highs)
                return -ENOMEM;
 
@@ -400,7 +400,7 @@ static int upgrade_mode(struct dm_dev *dd, int new_mode)
        struct dm_dev dd_copy;
        dev_t dev = dd->bdev->bd_dev;
 
-       memcpy(&dd_copy, dd, sizeof(dd_copy));
+       dd_copy = *dd;
 
        dd->mode |= new_mode;
        dd->bdev = NULL;
@@ -408,7 +408,7 @@ static int upgrade_mode(struct dm_dev *dd, int new_mode)
        if (!r)
                close_dev(&dd_copy);
        else
-               memcpy(dd, &dd_copy, sizeof(dd_copy));
+               *dd = dd_copy;
 
        return r;
 }
@@ -825,7 +825,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q)
         * Make sure we obey the optimistic sub devices
         * restrictions.
         */
-       q->max_sectors = t->limits.max_sectors;
+       blk_queue_max_sectors(q, t->limits.max_sectors);
        q->max_phys_segments = t->limits.max_phys_segments;
        q->max_hw_segments = t->limits.max_hw_segments;
        q->hardsect_size = t->limits.hardsect_size;
@@ -900,6 +900,28 @@ void dm_table_unplug_all(struct dm_table *t)
        }
 }
 
+int dm_table_flush_all(struct dm_table *t)
+{
+       struct list_head *d, *devices = dm_table_get_devices(t);
+       int ret = 0;
+
+       for (d = devices->next; d != devices; d = d->next) {
+               struct dm_dev *dd = list_entry(d, struct dm_dev, list);
+               request_queue_t *q = bdev_get_queue(dd->bdev);
+               int err;
+
+               if (!q->issue_flush_fn)
+                       err = -EOPNOTSUPP;
+               else
+                       err = q->issue_flush_fn(q, dd->bdev->bd_disk, NULL);
+
+               if (!ret)
+                       ret = err;
+       }
+
+       return ret;
+}
+
 EXPORT_SYMBOL(dm_vcalloc);
 EXPORT_SYMBOL(dm_get_device);
 EXPORT_SYMBOL(dm_put_device);
@@ -908,3 +930,4 @@ EXPORT_SYMBOL(dm_table_get_mode);
 EXPORT_SYMBOL(dm_table_put);
 EXPORT_SYMBOL(dm_table_get);
 EXPORT_SYMBOL(dm_table_unplug_all);
+EXPORT_SYMBOL(dm_table_flush_all);