diff options
| author | Shaohua Li <shli@fb.com> | 2015-08-13 14:32:04 -0700 |
|---|---|---|
| committer | NeilBrown <neilb@suse.com> | 2015-11-01 13:48:26 +1100 |
| commit | 5c7e81c3de9eb3db01e16190a1da0899efee645b (patch) | |
| tree | 3abff5f4c664ceeb23949099700890201c01105f | |
| parent | 713cf5a63954bdc1cd4bed0a81e98cbd8fc5928c (diff) | |
raid5: enable log for raid array with cache disk
Now log is safe to enable for raid array with cache disk
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: NeilBrown <neilb@suse.com>
| -rw-r--r-- | drivers/md/raid5.c | 11 | ||||
| -rw-r--r-- | include/uapi/linux/raid/md_p.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 122702d957a6..b0bf81d084fd 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -6329,8 +6329,11 @@ static void raid5_free_percpu(struct r5conf *conf) static void free_conf(struct r5conf *conf) { + if (conf->log) + r5l_exit_log(conf->log); if (conf->shrinker.seeks) unregister_shrinker(&conf->shrinker); + free_thread_groups(conf); shrink_stripes(conf); raid5_free_percpu(conf); @@ -6996,6 +6999,14 @@ static int run(struct mddev *mddev) mddev->queue); } + if (journal_dev) { + char b[BDEVNAME_SIZE]; + + printk(KERN_INFO"md/raid:%s: using device %s as journal\n", + mdname(mddev), bdevname(journal_dev->bdev, b)); + r5l_init_log(conf, journal_dev); + } + return 0; abort: md_unregister_thread(&mddev->thread); diff --git a/include/uapi/linux/raid/md_p.h b/include/uapi/linux/raid/md_p.h index 96e4196f9c79..c3e654c6d518 100644 --- a/include/uapi/linux/raid/md_p.h +++ b/include/uapi/linux/raid/md_p.h @@ -322,6 +322,7 @@ struct mdp_superblock_1 { |MD_FEATURE_NEW_OFFSET \ |MD_FEATURE_RECOVERY_BITMAP \ |MD_FEATURE_CLUSTERED \ + |MD_FEATURE_JOURNAL \ ) struct r5l_payload_header { |