From: Zefan Li <lizefan@huawei.com>
Date: Sun, 9 Oct 2016 11:00:59 +0000 (+0800)
Subject: Fix incomplete backport of commit 423f04d63cf4
X-Git-Tag: v3.4.113~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6883832be845e54570388a791140be16a0f26a71;p=thirdparty%2Fkernel%2Fstable.git

Fix incomplete backport of commit 423f04d63cf4

Signed-off-by: Zefan Li <lizefan@huawei.com>
---

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index a548eed389377..a4d994f0cea4b 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.
 		 */