On Tue, Dec 08 2015, Song Liu wrote:
> In Assemble, getinfo_super() over writes journal_clean, to same
> correct journal clean, keep it in "journal_clean_tmp" before
> getinfo_super().
Change "same" to "save" (and a couple of other little improvements).
>
> 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;
Removed "_tmp", it is just noise.
> 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 */
i++; /* increment i */
!!
I removed the comment.
Applied, thanks,
NeilBrown
> 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
Attachment:
signature.asc
Description: PGP signature
