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

Commit aff69d89 authored by bingjingc's avatar bingjingc Committed by Shaohua Li
Browse files

md/raid5: correct degraded calculation in raid5_error 



When disk failure occurs on new disks for reshape, mddev->degraded
is not calculated correctly. Faulty bit of the failure device is not
set before raid5_calc_degraded(conf).

mdadm --create /dev/md0 --level=5 --raid-devices=3 /dev/loop[012]
mdadm /dev/md0 -a /dev/loop3
mdadm /dev/md0 --grow -n4
mdadm /dev/md0 -f /dev/loop3 # simulating disk failure

cat /sys/block/md0/md/degraded # it outputs 0, but it should be 1.

However, mdadm -D /dev/md0 will show that it is degraded. It's a bug.
It can be fixed by moving the resources raid5_calc_degraded() depends
on before it.

Reported-by: default avatarRoy Chung <roychung@synology.com>
Reviewed-by: default avatarAlex Wu <alexwu@synology.com>
Signed-off-by: default avatarBingJing Chang <bingjingc@synology.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent a0651c7f

drivers/md/raid5.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2677,13 +2677,13 @@ static void raid5_error(struct mddev *mddev, struct md_rdev *rdev) 
	pr_debug("raid456: error called\n");

	pr_debug("raid456: error called\n");





	spin_lock_irqsave(&conf->device_lock, flags);

	spin_lock_irqsave(&conf->device_lock, flags);

	set_bit(Faulty, &rdev->flags);

	clear_bit(In_sync, &rdev->flags);

	clear_bit(In_sync, &rdev->flags);

	mddev->degraded = raid5_calc_degraded(conf);

	mddev->degraded = raid5_calc_degraded(conf);

	spin_unlock_irqrestore(&conf->device_lock, flags);

	spin_unlock_irqrestore(&conf->device_lock, flags);

	set_bit(MD_RECOVERY_INTR, &mddev->recovery);

	set_bit(MD_RECOVERY_INTR, &mddev->recovery);





	set_bit(Blocked, &rdev->flags);

	set_bit(Blocked, &rdev->flags);

	set_bit(Faulty, &rdev->flags);

	set_mask_bits(&mddev->sb_flags, 0,

	set_mask_bits(&mddev->sb_flags, 0,

		      BIT(MD_SB_CHANGE_DEVS) | BIT(MD_SB_CHANGE_PENDING));

		      BIT(MD_SB_CHANGE_DEVS) | BIT(MD_SB_CHANGE_PENDING));

	pr_crit("md/raid:%s: Disk failure on %s, disabling device.\n"

	pr_crit("md/raid:%s: Disk failure on %s, disabling device.\n"