diff options
| author | Andre Noll <maan@systemlinux.org> | 2009-06-18 08:45:27 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-06-18 08:45:27 +1000 |
| commit | 664e7c413f1e90eceb0b2596dd73a0832faec058 (patch) | |
| tree | 72ea827a0f2a493766d3ea1fd14909c756aa4496 /drivers/md/raid1.c | |
| parent | 9d8f0363623b3da12c43007cf77f5e1a4e8a5964 (diff) | |
| download | kernel_samsung_smdk4412-664e7c413f1e90eceb0b2596dd73a0832faec058.tar.gz kernel_samsung_smdk4412-664e7c413f1e90eceb0b2596dd73a0832faec058.tar.bz2 kernel_samsung_smdk4412-664e7c413f1e90eceb0b2596dd73a0832faec058.zip | |
md: Convert mddev->new_chunk to sectors.
A straight-forward conversion which gets rid of some
multiplications/divisions/shifts. The patch also introduces a couple
of new ones, most of which are due to conf->chunk_size still being
represented in bytes. This will be cleaned up in subsequent patches.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 388635735ae..12f8f34f17a 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_sectors << 9 != mddev->new_chunk || + if (mddev->chunk_sectors != mddev->new_chunk_sectors || mddev->layout != mddev->new_layout || mddev->level != mddev->new_level) { - mddev->new_chunk = mddev->chunk_sectors << 9; + mddev->new_chunk_sectors = mddev->chunk_sectors; mddev->new_layout = mddev->layout; mddev->new_level = mddev->level; return -EINVAL; |