mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
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: Ming Lei <tom.leiming@gmail.com> Signed-off-by: Shaohua Li <shli@fb.com>
This commit is contained in:
parent
513e2faa01
commit
a7234234d0
1 changed files with 8 additions and 9 deletions
|
@ -142,10 +142,13 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
|
|||
}
|
||||
/* If not user-requests, copy the page pointers to all bios */
|
||||
if (!test_bit(MD_RECOVERY_REQUESTED, &pi->mddev->recovery)) {
|
||||
for (i=0; i<RESYNC_PAGES ; i++)
|
||||
for (j=1; j<pi->raid_disks; j++)
|
||||
r1_bio->bios[j]->bi_io_vec[i].bv_page =
|
||||
for (i = 0; i< RESYNC_PAGES; i++)
|
||||
for (j = 1; j < pi->raid_disks; j++) {
|
||||
struct page *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;
|
||||
|
@ -170,12 +173,8 @@ static void r1buf_pool_free(void *__r1_bio, void *data)
|
|||
struct r1bio *r1bio = __r1_bio;
|
||||
|
||||
for (i = 0; i < RESYNC_PAGES; i++)
|
||||
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);
|
||||
}
|
||||
for (j = pi->raid_disks; j-- ;)
|
||||
safe_put_page(r1bio->bios[j]->bi_io_vec[i].bv_page);
|
||||
for (i=0 ; i < pi->raid_disks; i++)
|
||||
bio_put(r1bio->bios[i]);
|
||||
|
||||
|
|
Loading…
Reference in a new issue