diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-27 14:57:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-27 14:57:42 +0000 |
| commit | 0f3550b731084e2790caf1d73bfe0e3a454aafae (patch) | |
| tree | 96e387b7ae0da48c3ac13dd5ce922c983bc5debb /drivers/md/raid5.c | |
| parent | b7e46105cae50b29ac0b08e2e3c04b5ca34bc2a5 (diff) | |
| parent | 51ad557e21b8713f3abc286c14bca4ed01b8e56d (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-14.01
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 4bed5454b8dc..51422999fd08 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -3391,7 +3391,7 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s) */ set_bit(R5_Insync, &dev->flags); - if (rdev && test_bit(R5_WriteError, &dev->flags)) { + if (test_bit(R5_WriteError, &dev->flags)) { /* This flag does not apply to '.replacement' * only to .rdev, so make sure to check that*/ struct md_rdev *rdev2 = rcu_dereference( @@ -3404,7 +3404,7 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s) } else clear_bit(R5_WriteError, &dev->flags); } - if (rdev && test_bit(R5_MadeGood, &dev->flags)) { + if (test_bit(R5_MadeGood, &dev->flags)) { /* This flag does not apply to '.replacement' * only to .rdev, so make sure to check that*/ struct md_rdev *rdev2 = rcu_dereference( |