md: takeover should clear unrelated bits

When we change level from raid1 to raid5, the MD_FAILFAST_SUPPORTED bit
will be accidentally set, but raid5 doesn't support it. The same is true
for the MD_HAS_JOURNAL bit.

Fix: 46533ff (md: Use REQ_FAILFAST_* on metadata writes where appropriate)
Reviewed-by: NeilBrown <neilb@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 94e0afce6d4c..efc2e744cfd3 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -3243,9 +3243,12 @@ static void *raid1_takeover(struct mddev *mddev)
                 mddev->new_layout = 0;
                 mddev->new_chunk_sectors = 0;
                 conf = setup_conf(mddev);
-                if (!IS_ERR(conf))
+                if (!IS_ERR(conf)) {
                         /* Array must appear to be quiesced */
                         conf->array_frozen = 1;
+                        clear_bit(MD_HAS_JOURNAL, &mddev->flags);
+                        clear_bit(MD_JOURNAL_CLEAN, &mddev->flags);
+                }
                 return conf;
         }
         return ERR_PTR(-EINVAL);