diff options
| author | Heinz Mauelshagen <heinzm@redhat.com> | 2018-03-16 23:01:59 +0100 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2018-04-03 15:04:19 -0400 |
| commit | 880bcce0dcc3172fe865352b492c41d85290cb8d (patch) | |
| tree | cc6e49e5a67ac7abaef250f6fd1284bdc01e5177 /drivers/md/dm-raid.c | |
| parent | 8192a0cd7648f222d8ba73f302df0f03f07d5c4f (diff) | |
| download | linux-880bcce0dcc3172fe865352b492c41d85290cb8d.tar.bz2 | |
dm raid: fix nosync status
Fix a race for "nosync" activations providing "aa.." device health
characters and "0/N" sync ratio rather than "AA..." and "N/N". Occurs
when status for the raid set is retrieved during resume before the MD
sync thread starts and clears the MD_RECOVERY_NEEDED flag.
Cc: stable@vger.kernel.org # 4.16+
Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-raid.c')
| -rw-r--r-- | drivers/md/dm-raid.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index b7a9c710ebec..598c9e3e41a5 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -3408,7 +3408,8 @@ static sector_t rs_get_progress(struct raid_set *rs, unsigned long recovery, set_bit(RT_FLAG_RS_IN_SYNC, &rs->runtime_flags); } else { - if (!test_bit(MD_RECOVERY_INTR, &recovery) && + if (!test_bit(__CTR_FLAG_NOSYNC, &rs->ctr_flags) && + !test_bit(MD_RECOVERY_INTR, &recovery) && (test_bit(MD_RECOVERY_NEEDED, &recovery) || test_bit(MD_RECOVERY_RESHAPE, &recovery) || test_bit(MD_RECOVERY_RUNNING, &recovery))) |