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

From	lizf@kernel.org
Newsgroups	linux.kernel
Subject	[PATCH 3.4 120/125] Fix incomplete backport of commit 423f04d63cf4
Date	2016-10-12 15:00 +0200
Message-ID	<srriy-4vs-33@gated-at.bofh.it> (permalink)
References	<srqZb-4nM-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Zefan Li <lizefan@huawei.com>

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

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


Signed-off-by: Zefan Li <lizefan@huawei.com>
---
 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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.4 120/125] Fix incomplete backport of commit 423f04d63cf4 lizf@kernel.org - 2016-10-12 15:00 +0200

csiph-web