From 6883832be845e54570388a791140be16a0f26a71 Mon Sep 17 00:00:00 2001 From: Zefan Li Date: Sun, 9 Oct 2016 19:00:59 +0800 Subject: [PATCH] Fix incomplete backport of commit 423f04d63cf4 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 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. */ -- 2.47.2