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

Commit 8e320d02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://neil.brown.name/md 

* 'for-linus' of git://neil.brown.name/md:
  md/raid1 - don't assume newly allocated bvecs are initialised.
parents 5d6700ea 303a0e11

drivers/md/raid1.c

+4 −3
Original line number Diff line number Diff line
@@ -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 (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 )