[PATCH 3.4 120/125] Fix incomplete backport of commit 423f04d63cf4

From: lizf
Date: Wed Oct 12 2016 - 08:59:10 EST


From: Zefan Li <lizefan@xxxxxxxxxx>

3.4.113-rc1 review patch. If anyone has any objections, please let me know.

------------------


Signed-off-by: Zefan Li <lizefan@xxxxxxxxxx>
---
drivers/md/raid1.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index a548eed..a4d994f 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1272,11 +1272,8 @@ static void error(struct mddev *mddev, struct md_rdev *rdev)
set_bit(Blocked, &rdev->flags);
spin_lock_irqsave(&conf->device_lock, flags);
if (test_and_clear_bit(In_sync, &rdev->flags)) {
- unsigned long flags;
- spin_lock_irqsave(&conf->device_lock, flags);
mddev->degraded++;
set_bit(Faulty, &rdev->flags);
- spin_unlock_irqrestore(&conf->device_lock, flags);
/*
* if recovery is running, make sure it aborts.
*/
--
1.9.1