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/bitmap.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/bitmap.c')
| -rw-r--r-- | drivers/md/bitmap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index f4eace5..40f3cd7 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -156,7 +156,8 @@ static int read_sb_page(struct mddev *mddev, loff_t offset, rdev_for_each(rdev, mddev) { if (! test_bit(In_sync, &rdev->flags) - || test_bit(Faulty, &rdev->flags)) + || test_bit(Faulty, &rdev->flags) + || test_bit(Bitmap_sync, &rdev->flags)) continue; target = offset + index * (PAGE_SIZE/512); |
