diff options
| author | NeilBrown <neilb@suse.de> | 2015-04-10 13:19:04 +1000 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-05-17 19:11:53 -0400 |
| commit | d2c861b700b0af90da2d60b1b256173628fa6785 (patch) | |
| tree | ae3e7360abba964a293d92999e4491a3dd701598 | |
| parent | f364a04fb44955c96c08f99171ba1cf822dcdea1 (diff) | |
| download | lwn-d2c861b700b0af90da2d60b1b256173628fa6785.tar.gz lwn-d2c861b700b0af90da2d60b1b256173628fa6785.zip | |
md/raid0: fix bug with chunksize not a power of 2.
[ Upstream commit 47d68979cc968535cb87f3e5f2e6a3533ea48fbd ]
Since commit 20d0189b1012a37d2533a87fb451f7852f2418d1
in v3.14-rc1 RAID0 has performed incorrect calculations
when the chunksize is not a power of 2.
This happens because "sector_div()" modifies its first argument, but
this wasn't taken into account in the patch.
So restore that first arg before re-using the variable.
Reported-by: Joe Landman <joe.landman@gmail.com>
Reported-by: Dave Chinner <david@fromorbit.com>
Fixes: 20d0189b1012a37d2533a87fb451f7852f2418d1
Cc: stable@vger.kernel.org (3.14 and later).
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | drivers/md/raid0.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index ba6b85de96d2..d5c12e5b6125 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -319,7 +319,7 @@ static struct strip_zone *find_zone(struct r0conf *conf, /* * remaps the bio to the target device. we separate two flows. - * power 2 flow and a general flow for the sake of perfromance + * power 2 flow and a general flow for the sake of performance */ static struct md_rdev *map_sector(struct mddev *mddev, struct strip_zone *zone, sector_t sector, sector_t *sector_offset) @@ -537,6 +537,7 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) split = bio; } + sector = bio->bi_iter.bi_sector; zone = find_zone(mddev->private, §or); tmp_dev = map_sector(mddev, zone, sector, §or); split->bi_bdev = tmp_dev->bdev; |