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>

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index c31f9e206148e98d38d34246bb31303023ff79d4..7ee0911fba7dc9e3a40396d0ae5dc784d6e3ed08 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -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]);