git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master'
[pandora-kernel.git]
/
drivers
/
md
/
raid0.c
diff --git
a/drivers/md/raid0.c
b/drivers/md/raid0.c
index
bcbb825
..
1836106
100644
(file)
--- 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 */
goto out_free_conf;
/* calculate array device size */
- mddev->array_s
ize
= 0;
+ mddev->array_s
ectors
= 0;
rdev_for_each(rdev, tmp, mddev)
rdev_for_each(rdev, tmp, mddev)
- mddev->array_s
ize += rdev->size
;
+ mddev->array_s
ectors += rdev->size * 2
;
printk("raid0 : md_size is %llu blocks.\n",
printk("raid0 : md_size is %llu blocks.\n",
- (unsigned long long)mddev->array_s
ize
);
+ (unsigned long long)mddev->array_s
ectors / 2
);
printk("raid0 : conf->hash_spacing is %llu blocks.\n",
(unsigned long long)conf->hash_spacing);
{
printk("raid0 : conf->hash_spacing is %llu blocks.\n",
(unsigned long long)conf->hash_spacing);
{
- sector_t s = mddev->array_s
ize
;
+ sector_t s = mddev->array_s
ectors / 2
;
sector_t space = conf->hash_spacing;
int round;
conf->preshift = 0;
sector_t space = conf->hash_spacing;
int round;
conf->preshift = 0;