[PATCH v2] r5cache: allow adding journal to array without journal

[PATCH v2] r5cache: allow adding journal to array without journal

[Song Liu]

This seems just work.

Signed-off-by: Song Liu <songliubraving@fb.com>
---
 Manage.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Manage.c b/Manage.c
index 5c3d2b9..5ff5de3 100644
--- a/Manage.c
+++ b/Manage.c
@@ -946,7 +946,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);
@@ -963,11 +962,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;
 	}
 
-- 
2.9.3

Re: [PATCH v2] r5cache: allow adding journal to array without journal

[Shaohua Li]

On Mon, Mar 13, 2017 at 05:11:38PM -0700, Song Liu wrote:
> This seems just work.

this is by no means a changelog :)
 
> Signed-off-by: Song Liu <songliubraving@fb.com>
> ---
>  Manage.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/Manage.c b/Manage.c
> index 5c3d2b9..5ff5de3 100644
> --- a/Manage.c
> +++ b/Manage.c
> @@ -946,7 +946,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);
> @@ -963,11 +962,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;
>  	}
>  
> -- 
> 2.9.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-raid" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html