Merge branch 'linus' into perfcounters/core

Merge reason: need the upstream facility added by:

  7f1e2ca: hrtimer: fix rq->lock inversion (again)

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index b4f4badc0068..274b491a11c1 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -123,6 +123,7 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
                                 goto out_free_pages;
 
                         bio->bi_io_vec[i].bv_page = page;
+                        bio->bi_vcnt = i+1;
                 }
         }
         /* If not user-requests, copy the page pointers to all bios */
@@ -138,9 +139,9 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
         return r1_bio;
 
 out_free_pages:
-        for (i=0; i < RESYNC_PAGES ; i++)
-                for (j=0 ; j < pi->raid_disks; j++)
-                        safe_put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page);
+        for (j=0 ; j < pi->raid_disks; j++)
+                for (i=0; i < r1_bio->bios[j]->bi_vcnt ; i++)
+                        put_page(r1_bio->bios[j]->bi_io_vec[i].bv_page);
         j = -1;
 out_free_bio:
         while ( ++j < pi->raid_disks )
@@ -585,7 +586,7 @@ static int raid1_congested(void *data, int bits)
                         /* Note the '|| 1' - when read_balance prefers
                          * non-congested targets, it can be removed
                          */
-                        if ((bits & (1<<BDI_write_congested)) || 1)
+                        if ((bits & (1<<BDI_async_congested)) || 1)
                                 ret |= bdi_congested(&q->backing_dev_info, bits);
                         else
                                 ret &= bdi_congested(&q->backing_dev_info, bits);