linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index a6c2484..9b1e2f5 100644 (file)
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2001 Sistina Software (UK) Limited.
+ * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
  *
  * This file is released under the GPL.
  */
@@ -57,7 +58,7 @@ struct dm_table {
 /*
  * Similar to ceiling(log_size(n))
  */
-static unsigned int int_log(unsigned long n, unsigned long base)
+static unsigned int int_log(unsigned int n, unsigned int base)
 {
        int result = 0;
 
@@ -241,7 +242,7 @@ static void free_devices(struct list_head *devices)
        }
 }
 
-void table_destroy(struct dm_table *t)
+static void table_destroy(struct dm_table *t)
 {
        unsigned int i;
 
@@ -454,6 +455,8 @@ static int __table_get_device(struct dm_table *t, struct dm_target *ti,
                        return r;
                }
 
+               format_dev_t(dd->name, dev);
+
                atomic_set(&dd->count, 0);
                list_add(&dd->list, &t->devices);
 
@@ -505,7 +508,7 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
                if (q->merge_bvec_fn)
                        rs->max_sectors =
                                min_not_zero(rs->max_sectors,
-                                            (unsigned short)(PAGE_SIZE >> 9));
+                                            (unsigned int) (PAGE_SIZE >> 9));
 
                rs->max_phys_segments =
                        min_not_zero(rs->max_phys_segments,
@@ -575,7 +578,7 @@ static char **realloc_argv(unsigned *array_size, char **old_argv)
 /*
  * Destructively splits up the argument list to pass to ctr.
  */
-static int split_args(int *argc, char ***argvp, char *input)
+int dm_split_args(int *argc, char ***argvp, char *input)
 {
        char *start, *end = input, *out, **argv = NULL;
        unsigned array_size = 0;
@@ -635,7 +638,7 @@ static int split_args(int *argc, char ***argvp, char *input)
 static void check_for_valid_limits(struct io_restrictions *rs)
 {
        if (!rs->max_sectors)
-               rs->max_sectors = MAX_SECTORS;
+               rs->max_sectors = SAFE_MAX_SECTORS;
        if (!rs->max_phys_segments)
                rs->max_phys_segments = MAX_PHYS_SEGMENTS;
        if (!rs->max_hw_segments)
@@ -663,14 +666,14 @@ int dm_table_add_target(struct dm_table *t, const char *type,
 
        if (!len) {
                tgt->error = "zero-length target";
-               DMERR(": %s\n", tgt->error);
+               DMERR("%s", tgt->error);
                return -EINVAL;
        }
 
        tgt->type = dm_get_target_type(type);
        if (!tgt->type) {
                tgt->error = "unknown target type";
-               DMERR(": %s\n", tgt->error);
+               DMERR("%s", tgt->error);
                return -EINVAL;
        }
 
@@ -688,7 +691,7 @@ int dm_table_add_target(struct dm_table *t, const char *type,
                goto bad;
        }
 
-       r = split_args(&argc, &argv, params);
+       r = dm_split_args(&argc, &argv, params);
        if (r) {
                tgt->error = "couldn't split parameters (insufficient memory)";
                goto bad;
@@ -707,7 +710,7 @@ int dm_table_add_target(struct dm_table *t, const char *type,
        return 0;
 
  bad:
-       DMERR(": %s\n", tgt->error);
+       DMERR("%s", tgt->error);
        dm_put_target_type(tgt->type);
        return r;
 }
@@ -848,18 +851,38 @@ int dm_table_get_mode(struct dm_table *t)
        return t->mode;
 }
 
-void dm_table_suspend_targets(struct dm_table *t)
+static void suspend_targets(struct dm_table *t, unsigned postsuspend)
 {
-       int i;
+       int i = t->num_targets;
+       struct dm_target *ti = t->targets;
 
-       for (i = 0; i < t->num_targets; i++) {
-               struct dm_target *ti = t->targets + i;
+       while (i--) {
+               if (postsuspend) {
+                       if (ti->type->postsuspend)
+                               ti->type->postsuspend(ti);
+               } else if (ti->type->presuspend)
+                       ti->type->presuspend(ti);
 
-               if (ti->type->suspend)
-                       ti->type->suspend(ti);
+               ti++;
        }
 }
 
+void dm_table_presuspend_targets(struct dm_table *t)
+{
+       if (!t)
+               return;
+
+       return suspend_targets(t, 0);
+}
+
+void dm_table_postsuspend_targets(struct dm_table *t)
+{
+       if (!t)
+               return;
+
+       return suspend_targets(t, 1);
+}
+
 void dm_table_resume_targets(struct dm_table *t)
 {
        int i;
@@ -926,6 +949,7 @@ EXPORT_SYMBOL(dm_vcalloc);
 EXPORT_SYMBOL(dm_get_device);
 EXPORT_SYMBOL(dm_put_device);
 EXPORT_SYMBOL(dm_table_event);
+EXPORT_SYMBOL(dm_table_get_size);
 EXPORT_SYMBOL(dm_table_get_mode);
 EXPORT_SYMBOL(dm_table_put);
 EXPORT_SYMBOL(dm_table_get);