diff options
author | Zhengyuan Liu <liuzhengyuan@kylinos.cn> | 2016-10-23 21:55:20 -0400 |
---|---|---|
committer | Shaohua Li <shli@fb.com> | 2016-10-24 18:28:18 -0400 |
commit | 28cd88e2b4c54a466dcae7eea1efac766d42386b (patch) | |
tree | 6b4d215745f50e64aee78d25cfbb77cb593c18cd | |
parent | 579ed34f7b751b8add233cba4cf755258dbdd60a (diff) |
md/raid5: initialize next_checkpoint field before use
No initial operation was done to this field when we
load/recovery the log, it got assignment only when IO
to raid disk was finished. So r5l_quiesce may use wrong
next_checkpoint to reclaim log space, that would make
reclaimable space calculation confused.
Signed-off-by: Zhengyuan Liu <liuzhengyuan@kylinos.cn>
Signed-off-by: Shaohua Li <shli@fb.com>
-rw-r--r-- | drivers/md/raid5-cache.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c index 1b1ab4a1d132..998ea0025dd0 100644 --- a/drivers/md/raid5-cache.c +++ b/drivers/md/raid5-cache.c | |||
@@ -1096,6 +1096,8 @@ static int r5l_recovery_log(struct r5l_log *log) | |||
1096 | log->seq = ctx.seq + 11; | 1096 | log->seq = ctx.seq + 11; |
1097 | log->log_start = r5l_ring_add(log, ctx.pos, BLOCK_SECTORS); | 1097 | log->log_start = r5l_ring_add(log, ctx.pos, BLOCK_SECTORS); |
1098 | r5l_write_super(log, ctx.pos); | 1098 | r5l_write_super(log, ctx.pos); |
1099 | log->last_checkpoint = ctx.pos; | ||
1100 | log->next_checkpoint = ctx.pos; | ||
1099 | } else { | 1101 | } else { |
1100 | log->log_start = ctx.pos; | 1102 | log->log_start = ctx.pos; |
1101 | log->seq = ctx.seq; | 1103 | log->seq = ctx.seq; |
@@ -1168,6 +1170,7 @@ create: | |||
1168 | if (log->max_free_space > RECLAIM_MAX_FREE_SPACE) | 1170 | if (log->max_free_space > RECLAIM_MAX_FREE_SPACE) |
1169 | log->max_free_space = RECLAIM_MAX_FREE_SPACE; | 1171 | log->max_free_space = RECLAIM_MAX_FREE_SPACE; |
1170 | log->last_checkpoint = cp; | 1172 | log->last_checkpoint = cp; |
1173 | log->next_checkpoint = cp; | ||
1171 | 1174 | ||
1172 | __free_page(page); | 1175 | __free_page(page); |
1173 | 1176 | ||