md: set MD_HAS_JOURNAL in correct places

Set MD_HAS_JOURNAL when a array is loaded or journal is initialized.
This is to avoid the flags set too early in journal disk hotadd.

Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: NeilBrown <neilb@suse.com>

2 files changed, 6 insertions, 4 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 0d1d822eeda5..29a4bbf62be5 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1597,6 +1597,11 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev)
                         mddev->new_chunk_sectors = mddev->chunk_sectors;
                 }
 
+                if (le32_to_cpu(sb->feature_map) & MD_FEATURE_JOURNAL) {
+                        set_bit(MD_HAS_JOURNAL, &mddev->flags);
+                        if (mddev->recovery_cp == MaxSector)
+                                set_bit(MD_JOURNAL_CLEAN, &mddev->flags);
+                }
         } else if (mddev->pers == NULL) {
                 /* Insist of good event counter while assembling, except for
                  * spares (which don't need an event count) */
@@ -1643,8 +1648,6 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev)
                         }
                         set_bit(Journal, &rdev->flags);
                         rdev->journal_tail = le64_to_cpu(sb->journal_tail);
-                        if (mddev->recovery_cp == MaxSector)
-                                set_bit(MD_JOURNAL_CLEAN, &mddev->flags);
                         rdev->raid_disk = 0;
                         break;
                 default:
@@ -1664,8 +1667,6 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev)
                         set_bit(WriteMostly, &rdev->flags);
                 if (le32_to_cpu(sb->feature_map) & MD_FEATURE_REPLACEMENT)
                         set_bit(Replacement, &rdev->flags);
-                if (le32_to_cpu(sb->feature_map) & MD_FEATURE_JOURNAL)
-                        set_bit(MD_HAS_JOURNAL, &mddev->flags);
         } else /* MULTIPATH are always insync */
                 set_bit(In_sync, &rdev->flags);
 
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 6d2b4789a928..7ac035a73281 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -1235,6 +1235,7 @@ int r5l_init_log(struct r5conf *conf, struct md_rdev *rdev)
                 goto error;
 
         rcu_assign_pointer(conf->log, log);
+        set_bit(MD_HAS_JOURNAL, &conf->mddev->flags);
         return 0;
 
 error: