summaryrefslogtreecommitdiff
path: root/drivers/md
diff options
context:
space:
mode:
authorZhengyuan Liu <liuzhengyuan@kylinos.cn>2016-12-04 11:49:44 +0300
committerShaohua Li <shli@fb.com>2016-12-06 04:11:02 +0300
commit3d7e7e1d9db048bc6c1503bca9c82193450fc476 (patch)
treea9f0729aae90a6974822263329fac7e33e6f7852 /drivers/md
parent43b9674832cc41ad0ad7b7e2ec397e47dcd5f6c3 (diff)
downloadlinux-3d7e7e1d9db048bc6c1503bca9c82193450fc476.tar.xz
md/r5cache: do r5c_update_log_state after log recovery
We should update log state after we did a log recovery, current completion may get wrong log state since log->log_start wasn't initalized until we called r5l_recovery_log. At log recovery stage, no lock needed as there is no race conditon. next_checkpoint field will be initialized in r5l_recovery_log too. Signed-off-by: Zhengyuan Liu <liuzhengyuan@kylinos.cn> Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/raid5-cache.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c
index 5efb876a588d..c3b3124e033b 100644
--- a/drivers/md/raid5-cache.c
+++ b/drivers/md/raid5-cache.c
@@ -2542,14 +2542,12 @@ create:
if (log->max_free_space > RECLAIM_MAX_FREE_SPACE)
log->max_free_space = RECLAIM_MAX_FREE_SPACE;
log->last_checkpoint = cp;
- log->next_checkpoint = cp;
- mutex_lock(&log->io_mutex);
- r5c_update_log_state(log);
- mutex_unlock(&log->io_mutex);
__free_page(page);
- return r5l_recovery_log(log);
+ ret = r5l_recovery_log(log);
+ r5c_update_log_state(log);
+ return ret;
ioerr:
__free_page(page);
return ret;