Commit 6c13618a authored by Li Nan's avatar Li Nan Committed by Jialin Zhang
Browse files

md/raid10: fix wrong setting of max_corr_read_errors 

hulk inclusion
category: bugfix
bugzilla: 188290, https://gitee.com/openeuler/kernel/issues/I6ECBD


CVE: NA

--------------------------------

max_corr_read_errors should not be negative number. Change it to
unsigned int where use it.

Signed-off-by: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent 15c1fcc5

drivers/md/md.c

+1 −1
Original line number Diff line number Diff line
@@ -4563,7 +4563,7 @@ __ATTR_PREALLOC(array_state, S_IRUGO|S_IWUSR, array_state_show, array_state_stor 


static ssize_t

max_corrected_read_errors_show(struct mddev *mddev, char *page) {

	return sprintf(page, "%d\n",

	return sprintf(page, "%u\n",

		       atomic_read(&mddev->max_corr_read_errors));

}

drivers/md/raid10.c

+2 −2
Original line number Diff line number Diff line
@@ -2325,7 +2325,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 
	int sect = 0; /* Offset from r10_bio->sector */

	int sectors = r10_bio->sectors;

	struct md_rdev *rdev;

	int max_read_errors = atomic_read(&mddev->max_corr_read_errors);

	unsigned int max_read_errors = atomic_read(&mddev->max_corr_read_errors);

	int d = r10_bio->devs[r10_bio->read_slot].devnum;



	/* still own a reference to this rdev, so it cannot
@@ -2344,7 +2344,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 
		char b[BDEVNAME_SIZE];

		bdevname(rdev->bdev, b);



		pr_notice("md/raid10:%s: %s: Raid device exceeded read_error threshold [cur %d:max %d]\n",

		pr_notice("md/raid10:%s: %s: Raid device exceeded read_error threshold [cur %u:max %u]\n",

			  mdname(mddev), b,

			  atomic_read(&rdev->read_errors), max_read_errors);

		pr_notice("md/raid10:%s: %s: Failing raid device\n",