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

Commit c9483634 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Shaohua Li
Browse files

md: move funcs from pers->resize to update_size 



raid1_resize and raid5_resize should also check the
mddev->queue if run underneath dm-raid.

And both set_capacity and revalidate_disk are used in
pers->resize such as raid1, raid10 and raid5. So
move them from personality file to common code.

Reviewed-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGuoqing Jiang <gqjiang@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 75df023f

drivers/md/md.c

+6 −2
Original line number Diff line number Diff line
@@ -6525,8 +6525,12 @@ static int update_size(struct mddev *mddev, sector_t num_sectors) 
			return -ENOSPC;

	}

	rv = mddev->pers->resize(mddev, num_sectors);

	if (!rv)

	if (!rv) {

		if (mddev->queue) {

			set_capacity(mddev->gendisk, mddev->array_sectors);

			revalidate_disk(mddev->gendisk);

		}

	}

	return rv;

}

drivers/md/raid1.c

+0 −2
Original line number Diff line number Diff line
@@ -3246,8 +3246,6 @@ static int raid1_resize(struct mddev *mddev, sector_t sectors) 
			return ret;

	}

	md_set_array_sectors(mddev, newsize);

	set_capacity(mddev->gendisk, mddev->array_sectors);

	revalidate_disk(mddev->gendisk);

	if (sectors > mddev->dev_sectors &&

	    mddev->recovery_cp > mddev->dev_sectors) {

		mddev->recovery_cp = mddev->dev_sectors;

drivers/md/raid10.c

+0 −4
Original line number Diff line number Diff line
@@ -3956,10 +3956,6 @@ static int raid10_resize(struct mddev *mddev, sector_t sectors) 
			return ret;

	}

	md_set_array_sectors(mddev, size);

	if (mddev->queue) {

		set_capacity(mddev->gendisk, mddev->array_sectors);

		revalidate_disk(mddev->gendisk);

	}

	if (sectors > mddev->dev_sectors &&

	    mddev->recovery_cp > oldsize) {

		mddev->recovery_cp = oldsize;

drivers/md/raid5.c

+0 −2
Original line number Diff line number Diff line
@@ -7605,8 +7605,6 @@ static int raid5_resize(struct mddev *mddev, sector_t sectors) 
			return ret;

	}

	md_set_array_sectors(mddev, newsize);

	set_capacity(mddev->gendisk, mddev->array_sectors);

	revalidate_disk(mddev->gendisk);

	if (sectors > mddev->dev_sectors &&

	    mddev->recovery_cp > mddev->dev_sectors) {

		mddev->recovery_cp = mddev->dev_sectors;