This is a note to let you know that I've just added the patch titled
md/r5cache: fix set_syndrome_sources() for data in cache
to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
md-r5cache-fix-set_syndrome_sources-for-data-in-cache.patch
and it can be found in the queue-4.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 0977762f6d15f13caccc20d71a5dec47d098907d Mon Sep 17 00:00:00 2001
From: Song Liu <songliubraving@xxxxxx>
Date: Mon, 13 Mar 2017 13:44:35 -0700
Subject: md/r5cache: fix set_syndrome_sources() for data in cache
From: Song Liu <songliubraving@xxxxxx>
commit 0977762f6d15f13caccc20d71a5dec47d098907d upstream.
Before this patch, device InJournal will be included in prexor
(SYNDROME_SRC_WANT_DRAIN) but not in reconstruct (SYNDROME_SRC_WRITTEN). So it
will break parity calculation. With srctype == SYNDROME_SRC_WRITTEN, we need
include both dev with non-null ->written and dev with R5_InJournal. This fixes
logic in 1e6d690(md/r5cache: caching phase of r5cache)
Signed-off-by: Song Liu <songliubraving@xxxxxx>
Signed-off-by: Shaohua Li <shli@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/md/raid5.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1364,7 +1364,8 @@ static int set_syndrome_sources(struct p
(test_bit(R5_Wantdrain, &dev->flags) ||
test_bit(R5_InJournal, &dev->flags))) ||
(srctype == SYNDROME_SRC_WRITTEN &&
- dev->written)) {
+ (dev->written ||
+ test_bit(R5_InJournal, &dev->flags)))) {
if (test_bit(R5_InJournal, &dev->flags))
srcs[slot] = sh->dev[i].orig_page;
else
Patches currently in stable-queue which might be from songliubraving@xxxxxx are
queue-4.10/md-r5cache-fix-set_syndrome_sources-for-data-in-cache.patch