RE: [PATCH 1/2] [mdadm] fix bug in assemble

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is the only patch, not [1/2]. 

Thanks,
Song


> -----Original Message-----
> From: Song Liu [mailto:songliubraving@xxxxxx]
> Sent: Monday, December 7, 2015 5:09 PM
> To: linux-raid@xxxxxxxxxxxxxxx
> Cc: neilb@xxxxxxxx; dan.j.williams@xxxxxxxxx; Shaohua Li <shli@xxxxxx>;
> hch@xxxxxxxxxxxxx; Kernel Team <Kernel-team@xxxxxx>; Song Liu
> <songliubraving@xxxxxx>
> Subject: [PATCH 1/2] [mdadm] fix bug in assemble
> 
> In Assemble, getinfo_super() over writes journal_clean, to same correct journal
> clean, keep it in "journal_clean_tmp" before getinfo_super().
> 
> Signed-off-by: Song Liu <songliubraving@xxxxxx>
> Signed-off-by: Shaohua Li <shli@xxxxxx>
> ---
>  Assemble.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/Assemble.c b/Assemble.c
> index 6b9a6da..0ab5943 100644
> --- a/Assemble.c
> +++ b/Assemble.c
> @@ -1302,6 +1302,7 @@ int Assemble(struct supertype *st, char *mddev,
>  	int bestcnt = 0;
>  	int devcnt;
>  	unsigned int okcnt, sparecnt, rebuilding_cnt, replcnt, journalcnt;
> +	int journal_clean_tmp = 0;
>  	int i;
>  	int was_forced = 0;
>  	int most_recent = 0;
> @@ -1592,7 +1593,7 @@ try_again:
>  			) {
>  			devices[j].uptodate = 1;
>  			if (devices[j].i.disk.state & (1<<MD_DISK_JOURNAL))
> -				content->journal_clean = 1;
> +				journal_clean_tmp = 1;  /* store in
> journal_clean_tmp */
>  			if (i < content->array.raid_disks * 2) {
>  				if (devices[j].i.recovery_start == MaxSector ||
>  				    (content->reshape_active &&
> @@ -1664,6 +1665,8 @@ try_again:
>  #ifndef MDASSEMBLE
>  	sysfs_init(content, mdfd, NULL);
>  #endif
> +	/* after reload context, store journal_clean in context */
> +	content->journal_clean = journal_clean_tmp;
>  	for (i=0; i<bestcnt; i++) {
>  		int j = best[i];
>  		unsigned int desired_state;
> --
> 2.4.6

--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux RAID Wiki]     [ATA RAID]     [Linux SCSI Target Infrastructure]     [Linux Block]     [Linux IDE]     [Linux SCSI]     [Linux Hams]     [Device Mapper]     [Device Mapper Cryptographics]     [Kernel]     [Linux Admin]     [Linux Net]     [GFS]     [RPM]     [git]     [Yosemite Forum]


  Powered by Linux