diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
| commit | e55574f93ecb78dac5a15f29d18f2ab4dbc813bc (patch) | |
| tree | ffce30ba6d6a11b3fdc5ebd28e5f3cca2d87d12c /drivers/md/raid10.c | |
| parent | 9ea00e4fa07ce46ab79c92087c72ae100de4de42 (diff) | |
| parent | d831fd1b46d04e5c8c8a0431c321578d25852695 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-v3.10-rt-14.09
Diffstat (limited to 'drivers/md/raid10.c')
| -rw-r--r-- | drivers/md/raid10.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index d2f8cd332b4a..a1ea2a753912 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -1681,11 +1681,11 @@ static void error(struct mddev *mddev, struct md_rdev *rdev) spin_lock_irqsave(&conf->device_lock, flags); mddev->degraded++; spin_unlock_irqrestore(&conf->device_lock, flags); - /* - * if recovery is running, make sure it aborts. - */ - set_bit(MD_RECOVERY_INTR, &mddev->recovery); } + /* + * If recovery is running, make sure it aborts. + */ + set_bit(MD_RECOVERY_INTR, &mddev->recovery); set_bit(Blocked, &rdev->flags); set_bit(Faulty, &rdev->flags); set_bit(MD_CHANGE_DEVS, &mddev->flags); @@ -2948,6 +2948,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, */ if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery)) { end_reshape(conf); + close_sync(conf); return 0; } @@ -4398,7 +4399,7 @@ read_more: read_bio->bi_private = r10_bio; read_bio->bi_end_io = end_sync_read; read_bio->bi_rw = READ; - read_bio->bi_flags &= ~(BIO_POOL_MASK - 1); + read_bio->bi_flags &= (~0UL << BIO_RESET_BITS); read_bio->bi_flags |= 1 << BIO_UPTODATE; read_bio->bi_vcnt = 0; read_bio->bi_size = 0; |