Commit 486b0f7b authored by Song Liu's avatar Song Liu Committed by Shaohua Li
Browse files

r5cache: set MD_JOURNAL_CLEAN correctly 



Currently, the code sets MD_JOURNAL_CLEAN when the array has
MD_FEATURE_JOURNAL and the recovery_cp is MaxSector. The array
will be MD_JOURNAL_CLEAN even if the journal device is missing.

With this patch, the MD_JOURNAL_CLEAN is only set when the journal
device presents.

Signed-off-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent c622ca54

drivers/md/md.c

+1 −4
Original line number Diff line number Diff line
@@ -1604,11 +1604,8 @@ 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) {

		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) */

drivers/md/raid5.c

+8 −5
Original line number Diff line number Diff line
@@ -6840,11 +6840,14 @@ static int raid5_run(struct mddev *mddev) 
	if (IS_ERR(conf))

		return PTR_ERR(conf);



	if (test_bit(MD_HAS_JOURNAL, &mddev->flags) && !journal_dev) {

		printk(KERN_ERR "md/raid:%s: journal disk is missing, force array readonly\n",

	if (test_bit(MD_HAS_JOURNAL, &mddev->flags)) {

		if (!journal_dev) {

			pr_err("md/raid:%s: journal disk is missing, force array readonly\n",

			       mdname(mddev));

			mddev->ro = 1;

			set_disk_ro(mddev->gendisk, 1);

		} else if (mddev->recovery_cp == MaxSector)

			set_bit(MD_JOURNAL_CLEAN, &mddev->flags);

	}



	conf->min_offset_diff = min_offset_diff;

CRA Git | Maintained and supported by SUSTech CRA and CCSE