raid5-cache: add another check conditon before replaying one stripe

New stripe that was just allocated has no STRIPE_R5C_CACHING state too,
add this check condition could avoid unnecessary replaying for empty stripe.

r5l_recovery_replay_one_stripe would reset stripe for any case, delete it
to make code more clean.

Signed-off-by: Zhengyuan Liu <liuzhengyuan@kylinos.cn>
Signed-off-by: Shaohua Li <shli@fb.com>

diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 874749dc7648a7162c48c3cefabf34a5ed4575ce..1ff3859bbcc3c9a76124ed6ff9a6e6cd20ae0838 100644 (file)
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -1887,9 +1887,9 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log,
                }
 
                if (payload->header.type == R5LOG_PAYLOAD_DATA) {
-                       if (!test_bit(STRIPE_R5C_CACHING, &sh->state)) {
+                       if (!test_bit(STRIPE_R5C_CACHING, &sh->state) &&
+                           test_bit(R5_Wantwrite, &sh->dev[sh->pd_idx].flags)) {
                                r5l_recovery_replay_one_stripe(conf, sh, ctx);
-                               r5l_recovery_reset_stripe(sh);
                                sh->log_start = ctx->pos;
                                list_move_tail(&sh->lru, cached_stripe_list);
                        }