From: Yufen Yu <yuyufen@huawei.com>
Date: Fri, 1 Feb 2019 02:45:01 +0000 (+0800)
Subject: raid1: simplify raid1_error function
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ebda52fa1be73952ec603b1fad685ce86ccb5ee6;p=linux.git

raid1: simplify raid1_error function

Remove redundance set_bit and let code simplify.

Signed-off-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
---

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 1d54109071cc8..7e63ccc4ae7b4 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1603,11 +1603,9 @@ static void raid1_error(struct mddev *mddev, struct md_rdev *rdev)
 		return;
 	}
 	set_bit(Blocked, &rdev->flags);
-	if (test_and_clear_bit(In_sync, &rdev->flags)) {
+	if (test_and_clear_bit(In_sync, &rdev->flags))
 		mddev->degraded++;
-		set_bit(Faulty, &rdev->flags);
-	} else
-		set_bit(Faulty, &rdev->flags);
+	set_bit(Faulty, &rdev->flags);
 	spin_unlock_irqrestore(&conf->device_lock, flags);
 	/*
 	 * if recovery is running, make sure it aborts.