Loading drivers/md/raid5-cache.c +4 −8 Original line number Diff line number Diff line Loading @@ -67,7 +67,7 @@ static char *r5c_journal_mode_str[] = {"write-through", /* * raid5 cache state machine * * With rhe RAID cache, each stripe works in two phases: * With the RAID cache, each stripe works in two phases: * - caching phase * - writing-out phase * Loading Loading @@ -1674,7 +1674,6 @@ r5l_recovery_replay_one_stripe(struct r5conf *conf, static struct stripe_head * r5c_recovery_alloc_stripe(struct r5conf *conf, struct list_head *recovery_list, sector_t stripe_sect, sector_t log_start) { Loading Loading @@ -1855,8 +1854,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log, stripe_sect); if (!sh) { sh = r5c_recovery_alloc_stripe(conf, cached_stripe_list, stripe_sect, ctx->pos); sh = r5c_recovery_alloc_stripe(conf, stripe_sect, ctx->pos); /* * cannot get stripe from raid5_get_active_stripe * try replay some stripes Loading @@ -1865,8 +1863,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log, r5c_recovery_replay_stripes( cached_stripe_list, ctx); sh = r5c_recovery_alloc_stripe( conf, cached_stripe_list, stripe_sect, ctx->pos); conf, stripe_sect, ctx->pos); } if (!sh) { pr_debug("md/raid:%s: Increasing stripe cache size to %d to recovery data on journal.\n", Loading @@ -1875,8 +1872,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log, raid5_set_cache_size(mddev, conf->min_nr_stripes * 2); sh = r5c_recovery_alloc_stripe( conf, cached_stripe_list, stripe_sect, ctx->pos); conf, stripe_sect, ctx->pos); } if (!sh) { pr_err("md/raid:%s: Cannot get enough stripes due to memory pressure. Recovery failed.\n", Loading Loading
drivers/md/raid5-cache.c +4 −8 Original line number Diff line number Diff line Loading @@ -67,7 +67,7 @@ static char *r5c_journal_mode_str[] = {"write-through", /* * raid5 cache state machine * * With rhe RAID cache, each stripe works in two phases: * With the RAID cache, each stripe works in two phases: * - caching phase * - writing-out phase * Loading Loading @@ -1674,7 +1674,6 @@ r5l_recovery_replay_one_stripe(struct r5conf *conf, static struct stripe_head * r5c_recovery_alloc_stripe(struct r5conf *conf, struct list_head *recovery_list, sector_t stripe_sect, sector_t log_start) { Loading Loading @@ -1855,8 +1854,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log, stripe_sect); if (!sh) { sh = r5c_recovery_alloc_stripe(conf, cached_stripe_list, stripe_sect, ctx->pos); sh = r5c_recovery_alloc_stripe(conf, stripe_sect, ctx->pos); /* * cannot get stripe from raid5_get_active_stripe * try replay some stripes Loading @@ -1865,8 +1863,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log, r5c_recovery_replay_stripes( cached_stripe_list, ctx); sh = r5c_recovery_alloc_stripe( conf, cached_stripe_list, stripe_sect, ctx->pos); conf, stripe_sect, ctx->pos); } if (!sh) { pr_debug("md/raid:%s: Increasing stripe cache size to %d to recovery data on journal.\n", Loading @@ -1875,8 +1872,7 @@ r5c_recovery_analyze_meta_block(struct r5l_log *log, raid5_set_cache_size(mddev, conf->min_nr_stripes * 2); sh = r5c_recovery_alloc_stripe( conf, cached_stripe_list, stripe_sect, ctx->pos); conf, stripe_sect, ctx->pos); } if (!sh) { pr_err("md/raid:%s: Cannot get enough stripes due to memory pressure. Recovery failed.\n", Loading