Commit a97b7896 authored by Song Liu's avatar Song Liu Committed by NeilBrown
Browse files

MD: add new bit to indicate raid array with journal 



If a raid array has journal feature bit set, add a new bit to indicate
this. If the array is started without journal disk existing, we know
there is something wrong.

Signed-off-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parent 6e74a9cf

drivers/md/md.c

+7 −3
Original line number Diff line number Diff line
@@ -1667,6 +1667,8 @@ 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);
@@ -1807,16 +1809,18 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev) 
	for (i=0; i<max_dev;i++)

		sb->dev_roles[i] = cpu_to_le16(MD_DISK_ROLE_FAULTY);



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

		sb->feature_map |= cpu_to_le32(MD_FEATURE_JOURNAL);



	rdev_for_each(rdev2, mddev) {

		i = rdev2->desc_nr;

		if (test_bit(Faulty, &rdev2->flags))

			sb->dev_roles[i] = cpu_to_le16(MD_DISK_ROLE_FAULTY);

		else if (test_bit(In_sync, &rdev2->flags))

			sb->dev_roles[i] = cpu_to_le16(rdev2->raid_disk);

		else if (test_bit(Journal, &rdev2->flags)) {

		else if (test_bit(Journal, &rdev2->flags))

			sb->dev_roles[i] = cpu_to_le16(MD_DISK_ROLE_JOURNAL);

			sb->feature_map |= cpu_to_le32(MD_FEATURE_JOURNAL);

		} else if (rdev2->raid_disk >= 0)

		else if (rdev2->raid_disk >= 0)

			sb->dev_roles[i] = cpu_to_le16(rdev2->raid_disk);

		else

			sb->dev_roles[i] = cpu_to_le16(MD_DISK_ROLE_SPARE);

drivers/md/md.h

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ struct mddev { 
				 * md_ioctl checked on it.

				 */

#define MD_JOURNAL_CLEAN 5	/* A raid with journal is already clean */

#define MD_HAS_JOURNAL	6	/* The raid array has journal feature set */



	int				suspended;

	atomic_t			active_io;