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

MD: change journal disk role to disk 0 



Neil pointed out setting journal disk role to raid_disks will confuse
reshape if we support reshape eventually. Switching the role to 0 (we
should be fine as long as the value >=0) and skip sysfs file creation to
avoid error.

Signed-off-by: default avatarShaohua Li <shli@fb.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parent cc578588

drivers/md/md.c

+1 −1
Original line number Diff line number Diff line
@@ -1652,7 +1652,7 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev) 
			rdev->journal_tail = le64_to_cpu(sb->journal_tail);

			if (mddev->recovery_cp == MaxSector)

				set_bit(MD_JOURNAL_CLEAN, &mddev->flags);

			rdev->raid_disk = mddev->raid_disks;

			rdev->raid_disk = 0;

			break;

		default:

			rdev->saved_raid_disk = role;

drivers/md/md.h

+6 −2
Original line number Diff line number Diff line
@@ -566,7 +566,9 @@ static inline char * mdname (struct mddev * mddev) 
static inline int sysfs_link_rdev(struct mddev *mddev, struct md_rdev *rdev)

{

	char nm[20];

	if (!test_bit(Replacement, &rdev->flags) && mddev->kobj.sd) {

	if (!test_bit(Replacement, &rdev->flags) &&

	    !test_bit(Journal, &rdev->flags) &&

	    mddev->kobj.sd) {

		sprintf(nm, "rd%d", rdev->raid_disk);

		return sysfs_create_link(&mddev->kobj, &rdev->kobj, nm);

	} else
@@ -576,7 +578,9 @@ static inline int sysfs_link_rdev(struct mddev *mddev, struct md_rdev *rdev) 
static inline void sysfs_unlink_rdev(struct mddev *mddev, struct md_rdev *rdev)

{

	char nm[20];

	if (!test_bit(Replacement, &rdev->flags) && mddev->kobj.sd) {

	if (!test_bit(Replacement, &rdev->flags) &&

	    !test_bit(Journal, &rdev->flags) &&

	    mddev->kobj.sd) {

		sprintf(nm, "rd%d", rdev->raid_disk);

		sysfs_remove_link(&mddev->kobj, nm);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE