From aba8c39b42d8d7edaa1c83d9163ab4426ebef44d Mon Sep 17 00:00:00 2001 From: majianpeng Date: Tue, 22 May 2012 13:55:03 +1000 Subject: [PATCH] --- yaml --- r: 305933 b: refs/heads/master c: 5fdd2cf8265c6de0f190dea80cc4c50da8f31293 h: refs/heads/master i: 305931: 2fa380a408229d21bc3e53dbc5e1c62e7d017d02 v: v3 --- [refs] | 2 +- trunk/drivers/md/raid10.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3e69ffe2aa29..5ccb25a884ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da8840a747c0dbf49506ec906757a6b87b9741e9 +refs/heads/master: 5fdd2cf8265c6de0f190dea80cc4c50da8f31293 diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c index ec271ae4318f..fb9062b5022c 100644 --- a/trunk/drivers/md/raid10.c +++ b/trunk/drivers/md/raid10.c @@ -173,10 +173,11 @@ static void * r10buf_pool_alloc(gfp_t gfp_flags, void *data) while (j--) for (i = 0; i < RESYNC_PAGES ; i++) safe_put_page(r10_bio->devs[j].bio->bi_io_vec[i].bv_page); - j = -1; + j = 0; out_free_bio: - while (++j < nalloc) { - bio_put(r10_bio->devs[j].bio); + for ( ; j < nalloc; j++) { + if (r10_bio->devs[j].bio) + bio_put(r10_bio->devs[j].bio); if (r10_bio->devs[j].repl_bio) bio_put(r10_bio->devs[j].repl_bio); }