diff options
| author | Shaohua Li <shli@fb.com> | 2015-12-18 05:19:16 +0100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2015-12-18 05:19:16 +0100 |
| commit | 9b15603dbd98ad1003355ef6ac7d682c75df81c1 (patch) | |
| tree | 3c72f0018a1e791e49025536d8e224242bf6055f /drivers/md/md.h | |
| parent | md/raid10: fix data corruption and crash during resync (diff) | |
| download | linux-9b15603dbd98ad1003355ef6ac7d682c75df81c1.tar.xz linux-9b15603dbd98ad1003355ef6ac7d682c75df81c1.zip | |
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: Shaohua Li <shli@fb.com>
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/md/md.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/md/md.h b/drivers/md/md.h index 2bea51edfab7..ca0b643fe3c1 100644 --- a/drivers/md/md.h +++ b/drivers/md/md.h @@ -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); } |