diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-05-19 13:55:40 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-05-19 13:55:40 +0200 |
| commit | b563ea676a46f3a297b1e64b6ece25b934aafba5 (patch) | |
| tree | 7b18cca93a853b253375d0a3f1cb5af242771768 /drivers/md/md.c | |
| parent | 4fe581d7f114d56f31f392448477cff5a4394065 (diff) | |
| parent | 73fcb1a370c76b202d406e95d9dabb76eaccf484 (diff) | |
Merge branch 'linus' into timers/2038
Merge upstream to pick up changes on which pending patches depend on.
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 3bea45e8ccff..c208c01f63a5 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9256,8 +9256,10 @@ void md_reload_sb(struct mddev *mddev, int nr) check_sb_changes(mddev, rdev); /* Read all rdev's to update recovery_offset */ - rdev_for_each_rcu(rdev, mddev) - read_rdev(mddev, rdev); + rdev_for_each_rcu(rdev, mddev) { + if (!test_bit(Faulty, &rdev->flags)) + read_rdev(mddev, rdev); + } } EXPORT_SYMBOL(md_reload_sb); |