| From 432621e038f9dce48ad04471d28ada37a52626a2 Mon Sep 17 00:00:00 2001 |
| From: Zefan Li <lizefan@huawei.com> |
| Date: Sun, 9 Oct 2016 19:00:59 +0800 |
| Subject: [PATCH 1/4] Fix incomplete backport of commit 423f04d63cf4 |
| |
| Signed-off-by: Zefan Li <lizefan@huawei.com> |
| --- |
| drivers/md/raid1.c | 3 --- |
| 1 file changed, 3 deletions(-) |
| |
| --- a/drivers/md/raid1.c |
| +++ b/drivers/md/raid1.c |
| @@ -1272,11 +1272,8 @@ static void error(struct mddev *mddev, s |
| 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. |
| */ |
