Merge tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...

[sfrench/cifs-2.6.git] / drivers / md / linear.c

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 946efef3a8f586c892387eca276a4a8383f4b04c..b99c19c7eb2237e6f6583530c849bcfcaa2887c2 100644 (file)
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -111,7 +111,7 @@ static int linear_issue_flush(request_queue_t *q, struct gendisk *disk,
        return ret;
 }
 
-static int linear_run (mddev_t *mddev)
+static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
 {
        linear_conf_t *conf;
        dev_info_t **table;
@@ -121,21 +121,21 @@ static int linear_run (mddev_t *mddev)
        sector_t curr_offset;
        struct list_head *tmp;
 
-       conf = kmalloc (sizeof (*conf) + mddev->raid_disks*sizeof(dev_info_t),
+       conf = kzalloc (sizeof (*conf) + raid_disks*sizeof(dev_info_t),
                        GFP_KERNEL);
        if (!conf)
-               goto out;
-       memset(conf, 0, sizeof(*conf) + mddev->raid_disks*sizeof(dev_info_t));
+               return NULL;
+
        mddev->private = conf;
 
        cnt = 0;
-       mddev->array_size = 0;
+       conf->array_size = 0;
 
        ITERATE_RDEV(mddev,rdev,tmp) {
                int j = rdev->raid_disk;
                dev_info_t *disk = conf->disks + j;
 
-               if (j < 0 || j > mddev->raid_disks || disk->rdev) {
+               if (j < 0 || j > raid_disks || disk->rdev) {
                        printk("linear: disk numbering problem. Aborting!\n");
                        goto out;
                }
@@ -153,16 +153,16 @@ static int linear_run (mddev_t *mddev)
                        blk_queue_max_sectors(mddev->queue, PAGE_SIZE>>9);
 
                disk->size = rdev->size;
-               mddev->array_size += rdev->size;
+               conf->array_size += rdev->size;
 
                cnt++;
        }
-       if (cnt != mddev->raid_disks) {
+       if (cnt != raid_disks) {
                printk("linear: not enough drives present. Aborting!\n");
                goto out;
        }
 
-       min_spacing = mddev->array_size;
+       min_spacing = conf->array_size;
        sector_div(min_spacing, PAGE_SIZE/sizeof(struct dev_info *));
 
        /* min_spacing is the minimum spacing that will fit the hash
@@ -171,7 +171,7 @@ static int linear_run (mddev_t *mddev)
         * that is larger than min_spacing as use the size of that as
         * the actual spacing
         */
-       conf->hash_spacing = mddev->array_size;
+       conf->hash_spacing = conf->array_size;
        for (i=0; i < cnt-1 ; i++) {
                sector_t sz = 0;
                int j;
@@ -201,7 +201,7 @@ static int linear_run (mddev_t *mddev)
                unsigned round;
                unsigned long base;
 
-               sz = mddev->array_size >> conf->preshift;
+               sz = conf->array_size >> conf->preshift;
                sz += 1; /* force round-up */
                base = conf->hash_spacing >> conf->preshift;
                round = sector_div(sz, base);
@@ -228,7 +228,7 @@ static int linear_run (mddev_t *mddev)
        curr_offset = 0;
        i = 0;
        for (curr_offset = 0;
-            curr_offset < mddev->array_size;
+            curr_offset < conf->array_size;
             curr_offset += conf->hash_spacing) {
 
                while (i < mddev->raid_disks-1 &&
@@ -248,14 +248,56 @@ static int linear_run (mddev_t *mddev)
 
        BUG_ON(table - conf->hash_table > nb_zone);
 
+       return conf;
+
+out:
+       kfree(conf);
+       return NULL;
+}
+
+static int linear_run (mddev_t *mddev)
+{
+       linear_conf_t *conf;
+
+       conf = linear_conf(mddev, mddev->raid_disks);
+
+       if (!conf)
+               return 1;
+       mddev->private = conf;
+       mddev->array_size = conf->array_size;
+
        blk_queue_merge_bvec(mddev->queue, linear_mergeable_bvec);
        mddev->queue->unplug_fn = linear_unplug;
        mddev->queue->issue_flush_fn = linear_issue_flush;
        return 0;
+}
 
-out:
-       kfree(conf);
-       return 1;
+static int linear_add(mddev_t *mddev, mdk_rdev_t *rdev)
+{
+       /* Adding a drive to a linear array allows the array to grow.
+        * It is permitted if the new drive has a matching superblock
+        * already on it, with raid_disk equal to raid_disks.
+        * It is achieved by creating a new linear_private_data structure
+        * and swapping it in in-place of the current one.
+        * The current one is never freed until the array is stopped.
+        * This avoids races.
+        */
+       linear_conf_t *newconf;
+
+       if (rdev->raid_disk != mddev->raid_disks)
+               return -EINVAL;
+
+       newconf = linear_conf(mddev,mddev->raid_disks+1);
+
+       if (!newconf)
+               return -ENOMEM;
+
+       newconf->prev = mddev_to_conf(mddev);
+       mddev->private = newconf;
+       mddev->raid_disks++;
+       mddev->array_size = newconf->array_size;
+       set_capacity(mddev->gendisk, mddev->array_size << 1);
+       return 0;
 }
 
 static int linear_stop (mddev_t *mddev)
@@ -263,8 +305,12 @@ static int linear_stop (mddev_t *mddev)
        linear_conf_t *conf = mddev_to_conf(mddev);
   
        blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
-       kfree(conf->hash_table);
-       kfree(conf);
+       do {
+               linear_conf_t *t = conf->prev;
+               kfree(conf->hash_table);
+               kfree(conf);
+               conf = t;
+       } while (conf);
 
        return 0;
 }
@@ -352,28 +398,32 @@ static void linear_status (struct seq_file *seq, mddev_t *mddev)
 }
 
 
-static mdk_personality_t linear_personality=
+static struct mdk_personality linear_personality =
 {
        .name           = "linear",
+       .level          = LEVEL_LINEAR,
        .owner          = THIS_MODULE,
        .make_request   = linear_make_request,
        .run            = linear_run,
        .stop           = linear_stop,
        .status         = linear_status,
+       .hot_add_disk   = linear_add,
 };
 
 static int __init linear_init (void)
 {
-       return register_md_personality (LINEAR, &linear_personality);
+       return register_md_personality (&linear_personality);
 }
 
 static void linear_exit (void)
 {
-       unregister_md_personality (LINEAR);
+       unregister_md_personality (&linear_personality);
 }
 
 
 module_init(linear_init);
 module_exit(linear_exit);
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("md-personality-1"); /* LINEAR */
+MODULE_ALIAS("md-personality-1"); /* LINEAR - deprecated*/
+MODULE_ALIAS("md-linear");
+MODULE_ALIAS("md-level--1");