summaryrefslogtreecommitdiffstats
path: root/drivers/md/raid5.c
diff options
context:
space:
mode:
authorSong Liu <songliubraving@fb.com>2016-11-18 00:24:44 +0100
committerShaohua Li <shli@fb.com>2016-11-18 22:28:28 +0100
commit5aabf7c49d9ebe54a318976276b187637177a03e (patch)
tree305211b396ce8c43588e15ca2f80bd480a4b82aa /drivers/md/raid5.c
parentmd/r5cache: r5cache recovery: part 1 (diff)
downloadlinux-5aabf7c49d9ebe54a318976276b187637177a03e.tar.xz
linux-5aabf7c49d9ebe54a318976276b187637177a03e.zip
md/r5cache: r5cache recovery: part 2
1. In previous patch, we: - add new data to r5l_recovery_ctx - add new functions to recovery write-back cache The new functions are not used in this patch, so this patch does not change the behavior of recovery. 2. In this patchpatch, we: - modify main recovery procedure r5l_recovery_log() to call new functions - remove old functions Signed-off-by: Song Liu <songliubraving@fb.com> Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r--drivers/md/raid5.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 17cf98e93307..aa4968c04055 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -7100,7 +7100,8 @@ static int raid5_run(struct mddev *mddev)
pr_debug("md/raid:%s: using device %s as journal\n",
mdname(mddev), bdevname(journal_dev->bdev, b));
- r5l_init_log(conf, journal_dev);
+ if (r5l_init_log(conf, journal_dev))
+ goto abort;
}
return 0;