From 3373d49f32b2bd8149f633727eba453708a9bf9c Mon Sep 17 00:00:00 2001 From: Song Liu Date: Tue, 28 Mar 2017 11:04:44 -0700 Subject: mdadm/r5cache: allow adding journal to array without journal Currently, --add-journal can be only used to recreate broken journal for arrays with journal since creation. As the kernel code getting more mature, this constraint is no longer necessary. This patch allows --add-journal to add journal to array without journal. Signed-off-by: Song Liu Signed-off-by: Jes Sorensen --- Manage.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'Manage.c') diff --git a/Manage.c b/Manage.c index 04b9398..b82a729 100644 --- a/Manage.c +++ b/Manage.c @@ -911,7 +911,6 @@ int Manage_add(int fd, int tfd, struct mddev_dev *dv, /* only add journal to array that supports journaling */ if (dv->disposition == 'j') { - struct mdinfo mdi; struct mdinfo *mdp; mdp = sysfs_read(fd, NULL, GET_ARRAY_STATE); @@ -928,11 +927,6 @@ int Manage_add(int fd, int tfd, struct mddev_dev *dv, sysfs_free(mdp); - tst->ss->getinfo_super(tst, &mdi, NULL); - if (mdi.journal_device_required == 0) { - pr_err("%s does not support journal device.\n", devname); - return -1; - } disc.raid_disk = 0; } -- cgit v1.2.1