raid5-ppl: check recovery_offset when performing ppl recovery

[ Upstream commit 07719ff767dcd8cc42050f185d332052f3816546 ]

If starting an array that is undergoing rebuild, make ppl recovery honor
the recovery_offset of a member disk and don't read data that is not yet
in-sync.

Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/raid5-ppl.c b/drivers/md/raid5-ppl.c
index cd026c88f7efa7e1bf2367a4a6f41ab5336b451e..702b760088869053e56f649ccd54d1daf9c31a46 100644 (file)
--- a/drivers/md/raid5-ppl.c
+++ b/drivers/md/raid5-ppl.c
@@ -758,7 +758,8 @@ static int ppl_recover_entry(struct ppl_log *log, struct ppl_header_entry *e,
                                 (unsigned long long)sector);
 
                        rdev = conf->disks[dd_idx].rdev;
-                       if (!rdev) {
+                       if (!rdev || (!test_bit(In_sync, &rdev->flags) &&
+                                     sector >= rdev->recovery_offset)) {
                                pr_debug("%s:%*s data member disk %d missing\n",
                                         __func__, indent, "", dd_idx);
                                update_parity = false;