summaryrefslogtreecommitdiffstats
path: root/drivers/md/raid1.c
diff options
context:
space:
mode:
authorAndre Noll <maan@systemlinux.org>2009-06-18 08:45:01 +1000
committerNeilBrown <neilb@suse.de>2009-06-18 08:45:01 +1000
commit9d8f0363623b3da12c43007cf77f5e1a4e8a5964 (patch)
tree0fee53971a397ade209dd36c4f1ed50db6450faf /drivers/md/raid1.c
parentfbb704efb784e2c8418e34dc3013af76bdd58101 (diff)
downloadop-kernel-dev-9d8f0363623b3da12c43007cf77f5e1a4e8a5964.zip
op-kernel-dev-9d8f0363623b3da12c43007cf77f5e1a4e8a5964.tar.gz
md: Make mddev->chunk_size sector-based.
This patch renames the chunk_size field to chunk_sectors with the implied change of semantics. Since is_power_of_2(chunk_size) = is_power_of_2(chunk_sectors << 9) = is_power_of_2(chunk_sectors) these bits don't need an adjustment for the shift. 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 5ea5bca..3886357 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2161,10 +2161,10 @@ static int raid1_reshape(mddev_t *mddev)
int d, d2, err;
/* Cannot change chunk_size, layout, or level */
- if (mddev->chunk_size != mddev->new_chunk ||
+ if (mddev->chunk_sectors << 9 != mddev->new_chunk ||
mddev->layout != mddev->new_layout ||
mddev->level != mddev->new_level) {
- mddev->new_chunk = mddev->chunk_size;
+ mddev->new_chunk = mddev->chunk_sectors << 9;
mddev->new_layout = mddev->layout;
mddev->new_level = mddev->level;
return -EINVAL;
OpenPOWER on IntegriCloud