summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZefan Li <lizefan@huawei.com>2016-10-09 19:00:59 +0800
committerZefan Li <lizefan@huawei.com>2016-10-26 23:15:44 +0800
commit6883832be845e54570388a791140be16a0f26a71 (patch)
tree47d26e992fde712c6b3f3ed59624e9de755be2e5
parentaf706acbb5dbf492ad19fb448c2f05db8595f78e (diff)
downloadlinux-rt-6883832be845e54570388a791140be16a0f26a71.tar.gz
Fix incomplete backport of commit 423f04d63cf4
Signed-off-by: Zefan Li <lizefan@huawei.com>
-rw-r--r--drivers/md/raid1.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index a548eed38937..a4d994f0cea4 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.
*/