Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a62ab49e authored by Shaohua Li's avatar Shaohua Li Committed by NeilBrown
Browse files

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: default avatarShaohua Li <shli@fb.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parent 274d8cbd

drivers/md/md.c

+5 −4
Original line number Diff line number Diff line
@@ -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);

drivers/md/raid5-cache.c

+1 −0
Original line number Diff line number Diff line
@@ -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: