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

Commit a7234234 authored by Ming Lei's avatar Ming Lei Committed by Shaohua Li
Browse files

md: raid1: simplify r1buf_pool_free() 



This patch gets each page's reference of each bio for resync,
then r1buf_pool_free() gets simplified a lot.

The same policy has been taken in raid10's buf pool allocation/free
too.

Signed-off-by: default avatarMing Lei <tom.leiming@gmail.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 513e2faa

drivers/md/raid1.c

+8 −9
Original line number Original line Diff line number Diff line
@@ -143,9 +143,12 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data) 
	/* If not user-requests, copy the page pointers to all bios */

	/* If not user-requests, copy the page pointers to all bios */

	if (!test_bit(MD_RECOVERY_REQUESTED, &pi->mddev->recovery)) {

	if (!test_bit(MD_RECOVERY_REQUESTED, &pi->mddev->recovery)) {

		for (i = 0; i< RESYNC_PAGES; i++)

		for (i = 0; i< RESYNC_PAGES; i++)

			for (j=1; j<pi->raid_disks; j++)

			for (j = 1; j < pi->raid_disks; j++) {

				r1_bio->bios[j]->bi_io_vec[i].bv_page =

				struct page *page =

					r1_bio->bios[0]->bi_io_vec[i].bv_page;

					r1_bio->bios[0]->bi_io_vec[i].bv_page;

				get_page(page);

				r1_bio->bios[j]->bi_io_vec[i].bv_page = page;

			}

	}

	}





	r1_bio->master_bio = NULL;

	r1_bio->master_bio = NULL;
@@ -170,12 +173,8 @@ static void r1buf_pool_free(void *__r1_bio, void *data) 
	struct r1bio *r1bio = __r1_bio;

	struct r1bio *r1bio = __r1_bio;





	for (i = 0; i < RESYNC_PAGES; i++)

	for (i = 0; i < RESYNC_PAGES; i++)

		for (j = pi->raid_disks; j-- ;) {

		for (j = pi->raid_disks; j-- ;)

			if (j == 0 ||

			    r1bio->bios[j]->bi_io_vec[i].bv_page !=

			    r1bio->bios[0]->bi_io_vec[i].bv_page)

			safe_put_page(r1bio->bios[j]->bi_io_vec[i].bv_page);

			safe_put_page(r1bio->bios[j]->bi_io_vec[i].bv_page);

		}

	for (i=0 ; i < pi->raid_disks; i++)

	for (i=0 ; i < pi->raid_disks; i++)

		bio_put(r1bio->bios[i]);

		bio_put(r1bio->bios[i]);