diff options
| author | Andre Noll <maan@systemlinux.org> | 2008-07-21 17:05:22 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2008-07-21 17:05:22 +1000 |
| commit | f233ea5c9e0d8b95e4283bf6a3436b88f6fd3586 (patch) | |
| tree | 8a36b621de46da23f3957c6e3ea4d653c2937544 /drivers/md/raid1.c | |
| parent | 15f4a5fdf3aa07b53f6a7969664741db5882e485 (diff) | |
| download | linux-3.10-f233ea5c9e0d8b95e4283bf6a3436b88f6fd3586.tar.gz linux-3.10-f233ea5c9e0d8b95e4283bf6a3436b88f6fd3586.tar.bz2 linux-3.10-f233ea5c9e0d8b95e4283bf6a3436b88f6fd3586.zip | |
md: Make mddev->array_size sector-based.
This patch renames the array_size field of struct mddev_s to array_sectors
and converts all instances to use units of 512 byte sectors instead of 1k
blocks.
Signed-off-by: Andre Noll <maan@systemlinux.org>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 491dc2d4ad5..03a5ab705c2 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2043,7 +2043,7 @@ static int run(mddev_t *mddev) /* * Ok, everything is just fine now */ - mddev->array_size = mddev->size; + mddev->array_sectors = mddev->size * 2; mddev->queue->unplug_fn = raid1_unplug; mddev->queue->backing_dev_info.congested_fn = raid1_congested; @@ -2105,14 +2105,15 @@ static int raid1_resize(mddev_t *mddev, sector_t sectors) * any io in the removed space completes, but it hardly seems * worth it. */ - mddev->array_size = sectors>>1; - set_capacity(mddev->gendisk, mddev->array_size << 1); + mddev->array_sectors = sectors; + set_capacity(mddev->gendisk, mddev->array_sectors); mddev->changed = 1; - if (mddev->array_size > mddev->size && mddev->recovery_cp == MaxSector) { + if (mddev->array_sectors / 2 > mddev->size && + mddev->recovery_cp == MaxSector) { mddev->recovery_cp = mddev->size << 1; set_bit(MD_RECOVERY_NEEDED, &mddev->recovery); } - mddev->size = mddev->array_size; + mddev->size = mddev->array_sectors / 2; mddev->resync_max_sectors = sectors; return 0; } |