diff options
| author | Yufen Yu <yuyufen@huawei.com> | 2019-02-01 10:45:01 +0800 |
|---|---|---|
| committer | Song Liu <songliubraving@fb.com> | 2019-02-04 10:37:11 -0800 |
| commit | ebda52fa1be73952ec603b1fad685ce86ccb5ee6 (patch) | |
| tree | fc21bccb14f3e38d21485352da084cdbad009252 /drivers/md/raid1.c | |
| parent | f1e5b6239bdd46aa3f4e631611800ea7d10826c4 (diff) | |
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>
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 1d54109071cc..7e63ccc4ae7b 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. |