diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-18 11:51:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-18 11:51:08 -0700 |
| commit | 74cbd96bc2e00f5daa805e2ebf49e998f7045062 (patch) | |
| tree | e3e72349fc4ce85bdbe948c935199b094fc35ae4 /drivers/md/raid5.c | |
| parent | bef85bd7db2669291e33c59875fae33d24c11da3 (diff) | |
| parent | 6409e84ec58fc4c0085d8921f8e01815dc871971 (diff) | |
| download | op-kernel-dev-74cbd96bc2e00f5daa805e2ebf49e998f7045062.zip op-kernel-dev-74cbd96bc2e00f5daa805e2ebf49e998f7045062.tar.gz | |
Merge tag 'md/4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
Pull MD fixes from Shaohua Li:
- raid5-ppl fix by Artur. This one is introduced in this release cycle.
- raid5 reshape fix by Xiao. This is an old bug and will be added to
stable.
- bitmap fix by Guoqing.
* tag 'md/4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md:
raid5-ppl: use BIOSET_NEED_BVECS when creating bioset
Raid5 should update rdev->sectors after reshape
md/bitmap: don't read page from device with Bitmap_sync
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 2ceb338..aeeb8d6 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7951,12 +7951,10 @@ static void end_reshape(struct r5conf *conf) { if (!test_bit(MD_RECOVERY_INTR, &conf->mddev->recovery)) { - struct md_rdev *rdev; spin_lock_irq(&conf->device_lock); conf->previous_raid_disks = conf->raid_disks; - rdev_for_each(rdev, conf->mddev) - rdev->data_offset = rdev->new_data_offset; + md_finish_reshape(conf->mddev); smp_wmb(); conf->reshape_progress = MaxSector; conf->mddev->reshape_position = MaxSector; |
