Unverified Commit 6827f6e2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11417 md/raid5: avoid BUG_ON() while continue reshape after reassembling 

Merge Pull Request from: @ci-robot 
 
PR sync from: Li Nan <linan122@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/SHC7NJ2DCNAFSF6SLFPCG2EIBL2DSA6Q/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAMNBN 
 
Link:https://gitee.com/openeuler/kernel/pulls/11417

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 7a5c3dc8 0ee75f93

drivers/md/raid5.c

+13 −7
Original line number Diff line number Diff line
@@ -5997,7 +5997,9 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, int *sk 
	safepos = conf->reshape_safe;

	sector_div(safepos, data_disks);

	if (mddev->reshape_backwards) {

		BUG_ON(writepos < reshape_sectors);

		if (WARN_ON(writepos < reshape_sectors))

			return MaxSector;



		writepos -= reshape_sectors;

		readpos += reshape_sectors;

		safepos += reshape_sectors;
@@ -6015,14 +6017,18 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, int *sk 
	 * to set 'stripe_addr' which is where we will write to.

	 */

	if (mddev->reshape_backwards) {

		BUG_ON(conf->reshape_progress == 0);

		if (WARN_ON(conf->reshape_progress == 0))

			return MaxSector;



		stripe_addr = writepos;

		BUG_ON((mddev->dev_sectors &

			~((sector_t)reshape_sectors - 1))

		       - reshape_sectors - stripe_addr

		       != sector_nr);

		if (WARN_ON((mddev->dev_sectors &

		    ~((sector_t)reshape_sectors - 1)) -

		    reshape_sectors - stripe_addr != sector_nr))

			return MaxSector;

	} else {

		BUG_ON(writepos != sector_nr + reshape_sectors);

		if (WARN_ON(writepos != sector_nr + reshape_sectors))

			return MaxSector;



		stripe_addr = sector_nr;

	}