Merge branch 'for-linus' of git://neil.brown.name/md

* 'for-linus' of git://neil.brown.name/md: (52 commits)
  md: Protect access to mddev->disks list using RCU
  md: only count actual openers as access which prevent a 'stop'
  md: linear: Make array_size sector-based and rename it to array_sectors.
  md: Make mddev->array_size sector-based.
  md: Make super_type->rdev_size_change() take sector-based sizes.
  md: Fix check for overlapping devices.
  md: Tidy up rdev_size_store a bit:
  md: Remove some unused macros.
  md: Turn rdev->sb_offset into a sector-based quantity.
  md: Make calc_dev_sboffset() return a sector count.
  md: Replace calc_dev_size() by calc_num_sectors().
  md: Make update_size() take the number of sectors.
  md: Better control of when do_md_stop is allowed to stop the array.
  md: get_disk_info(): Don't convert between signed and unsigned and back.
  md: Simplify restart_array().
  md: alloc_disk_sb(): Return proper error value.
  md: Simplify sb_equal().
  md: Simplify uuid_equal().
  md: sb_equal(): Fix misleading printk.
  md: Fix a typo in the comment to cmd_match().
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index bcbb82594a19..183610635661 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -295,16 +295,16 @@ static int raid0_run (mddev_t *mddev)
                 goto out_free_conf;
 
         /* calculate array device size */
-        mddev->array_size = 0;
+        mddev->array_sectors = 0;
         rdev_for_each(rdev, tmp, mddev)
-                mddev->array_size += rdev->size;
+                mddev->array_sectors += rdev->size * 2;
 
         printk("raid0 : md_size is %llu blocks.\n", 
-                (unsigned long long)mddev->array_size);
+                (unsigned long long)mddev->array_sectors / 2);
         printk("raid0 : conf->hash_spacing is %llu blocks.\n",
                 (unsigned long long)conf->hash_spacing);
         {
-                sector_t s = mddev->array_size;
+                sector_t s = mddev->array_sectors / 2;
                 sector_t space = conf->hash_spacing;
                 int round;
                 conf->preshift = 0;