From 36a73deed4b22b069d78659fc6c81769dee333b8 Mon Sep 17 00:00:00 2001
From: majianpeng <majianpeng@gmail.com>
Date: Mon, 2 Apr 2012 01:04:19 +1000
Subject: [PATCH] --- yaml --- r: 298550 b: refs/heads/master c:
 a42f9d83b5c05dc6e678a1f0cd9767502c2c58de h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cb64011408ee..a1b2adf554a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24b961f811a3e790a9b93604d2594bfb6cce4fa4
+refs/heads/master: a42f9d83b5c05dc6e678a1f0cd9767502c2c58de
diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c
index 242440831b23..8c420f178603 100644
--- a/trunk/drivers/md/raid1.c
+++ b/trunk/drivers/md/raid1.c
@@ -2386,8 +2386,7 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp
 		int ok = 1;
 		for (i = 0 ; i < conf->raid_disks * 2 ; i++)
 			if (r1_bio->bios[i]->bi_end_io == end_sync_write) {
-				struct md_rdev *rdev =
-					rcu_dereference(conf->mirrors[i].rdev);
+				struct md_rdev *rdev = conf->mirrors[i].rdev;
 				ok = rdev_set_badblocks(rdev, sector_nr,
 							min_bad, 0
 					) && ok;