diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
| commit | dda93b45389f025fd3422d22cc31cc1ea6040305 (patch) | |
| tree | 44a856744843e24ed1baf6ca4edb1be04809a606 /drivers/md/dm-raid.c | |
| parent | 2e62024c265aa69315ed02835623740030435380 (diff) | |
| parent | b61b8bba18fe2b63d38fdaf9b83de25e2d787dfe (diff) | |
Merge branch 'x86/cache' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/md/dm-raid.c')
| -rw-r--r-- | drivers/md/dm-raid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 5ba067fa0c72..c44925e4e481 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c | |||
| @@ -3353,7 +3353,7 @@ static const char *sync_str(enum sync_state state) | |||
| 3353 | }; | 3353 | }; |
| 3354 | 3354 | ||
| 3355 | /* Return enum sync_state for @mddev derived from @recovery flags */ | 3355 | /* Return enum sync_state for @mddev derived from @recovery flags */ |
| 3356 | static const enum sync_state decipher_sync_action(struct mddev *mddev, unsigned long recovery) | 3356 | static enum sync_state decipher_sync_action(struct mddev *mddev, unsigned long recovery) |
| 3357 | { | 3357 | { |
| 3358 | if (test_bit(MD_RECOVERY_FROZEN, &recovery)) | 3358 | if (test_bit(MD_RECOVERY_FROZEN, &recovery)) |
| 3359 | return st_frozen; | 3359 | return st_frozen; |