From caba965ff87a456648a391d929928643fdccb531 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Fri, 23 May 2008 13:04:32 -0700
Subject: [PATCH] --- yaml --- r: 97249 b: refs/heads/master c:
 84255d1018c50e72c71a49f359989597d53a3f53 h: refs/heads/master i:   97247:
 55cb5fc9d04cac686e296963d29293741d521281 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/md/raid1.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 21927f01aafe..1efebf05cbc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80119ef5c8153e0a6cc5edf00c083dc98a9bd348
+refs/heads/master: 84255d1018c50e72c71a49f359989597d53a3f53
diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c
index ac409b7d83f5..21629ae46682 100644
--- a/trunk/drivers/md/raid1.c
+++ b/trunk/drivers/md/raid1.c
@@ -773,7 +773,7 @@ static int make_request(struct request_queue *q, struct bio * bio)
 	r1bio_t *r1_bio;
 	struct bio *read_bio;
 	int i, targets = 0, disks;
-	struct bitmap *bitmap = mddev->bitmap;
+	struct bitmap *bitmap;
 	unsigned long flags;
 	struct bio_list bl;
 	struct page **behind_pages = NULL;
@@ -802,6 +802,8 @@ static int make_request(struct request_queue *q, struct bio * bio)
 
 	wait_barrier(conf);
 
+	bitmap = mddev->bitmap;
+
 	disk_stat_inc(mddev->gendisk, ios[rw]);
 	disk_stat_add(mddev->gendisk, sectors[rw], bio_sectors(bio));