> On Monday, June 02, 2014 4:30 AM NeilBrown wrote: > To: Baldysiak, Pawel > Cc: linux-raid@xxxxxxxxxxxxxxx; Paszkiewicz, Artur > Subject: Re: [PATCH] Do not set default 'before.layout' when reshaping from > RAID4 to RAID4 > > On Fri, 30 May 2014 14:38:09 +0000 "Baldysiak, Pawel" > <pawel.baldysiak@xxxxxxxxx> wrote: > > > Commit fdcad551e9a54c4aa8c4b63160b76e2c539a0441 > > brings some changes to reshape process. > > Setting 'before.layout' when reshaping from RAID4 to another RAID4 is > > not really necessary. > > If reshape is restarted 'before.layout' will be compared with > > 'info->array.layout' in reshape_array(). Changes brought by mentioned > > commit will cause this comparation return as false, becouse 'array.layout' > > is always set to 'ALGORITHM_PARITY_N' in analyse_change() for RAID4, > > so reshape will not be continued after reboot/stop. > > This patch reverts unnecessary changes. > > > > Signed-off-by: Pawel Baldysiak pawel.baldysiak@xxxxxxxxx > > Reviewed-by: Artur Paszkiewicz <artur.paszkiewicz@xxxxxxxxx> > > > > --- > > Grow.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/Grow.c b/Grow.c > > index 487111e..9dc157a 100644 > > --- a/Grow.c > > +++ b/Grow.c > > @@ -1338,7 +1338,6 @@ char *analyse_change(char *devname, struct > > mdinfo *info, struct reshape *re) > > > > switch (re->level) { > > case 4: > > - re->before.layout = 0; > > re->after.layout = 0; > > break; > > case 5: > > Applied, thanks. Though you seem to have forgotten how to make patches > properly. That one was totally white-space damaged. > > NeilBrown Hi Neil, Sorry for this white-space damage one again... There is mistake in patch applied to your repository - wrong line is removed. Below is the patch, which fixes this issue: Pawel Baldysiak From: Pawel Baldysiak <pawel.baldysiak@xxxxxxxxx> Date: Wed, 11 Jun 2014 16:54:59 +0200 Subject: [PATCH 1/1] Grow: fix removal of line in wrong case Commit 18d9bcfa33939cee345d4d7735bc6081bcc409c8 removed wrong line (in case RAID0->RAID4). This patch corrects this mistake (line should be removed in case RAID4->RAID4). Signed-off-by: Pawel Baldysiak <pawel.baldysiak@xxxxxxxxx> --- Grow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Grow.c b/Grow.c index 12730e2..a2f4f14 100644 --- a/Grow.c +++ b/Grow.c @@ -1324,6 +1324,7 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) switch (re->level) { case 4: + re->before.layout = 0; re->after.layout = 0; break; case 5: @@ -1339,7 +1340,6 @@ char *analyse_change(char *devname, struct mdinfo *info, struct reshape *re) switch (re->level) { case 4: - re->before.layout = 0; re->after.layout = 0; break; case 5: -- 1.9.0 ��.n��������+%������w��{.n�����{����w��ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f