Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932981AbcJLM7G (ORCPT ); Wed, 12 Oct 2016 08:59:06 -0400 Received: from mail.kernel.org ([198.145.29.136]:48806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755160AbcJLMpc (ORCPT ); Wed, 12 Oct 2016 08:45:32 -0400 From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Zefan Li Subject: [PATCH 3.4 120/125] Fix incomplete backport of commit 423f04d63cf4 Date: Wed, 12 Oct 2016 20:33:56 +0800 Message-Id: <1476275641-4697-120-git-send-email-lizf@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476275600-4626-1-git-send-email-lizf@kernel.org> References: <1476275600-4626-1-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 853 Lines: 30 From: Zefan Li 3.4.113-rc1 review patch. If anyone has any objections, please let me know. ------------------ Signed-off-by: Zefan Li --- 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