[sheepdog] [PATCH devel] journal: suppress compile errors

Liu Yuan namei.unix at gmail.com
Wed Apr 3 07:18:40 CEST 2013


On 04/03/2013 01:15 PM, Hitoshi Mitake wrote:
> Let's keep the devel branch build ready.
> 
> Signed-off-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
> ---
>  sheep/journal.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/sheep/journal.c b/sheep/journal.c
> index eccd6b6..47a0814 100644
> --- a/sheep/journal.c
> +++ b/sheep/journal.c
> @@ -395,9 +395,10 @@ int journal_write_store(uint64_t oid, const char *buf, size_t size,
>  		.flag = JF_STORE,
>  		.offset = offset,
>  		.size = size,
> -		.oid = oid,
>  		.create = create,
>  	};
> +
> +	jd.oid = oid;
>  	return journal_file_write(&jd, buf);
>  }
>  
> @@ -408,9 +409,10 @@ int journal_write_epoch(const char *buf, size_t size, uint32_t epoch)
>  		.flag = JF_EPOCH,
>  		.offset = 0,
>  		.size = size,
> -		.epoch = epoch,
>  		.create = true,
>  	};
> +
> +	jd.epoch = epoch;
>  	return journal_file_write(&jd, buf);
>  }
>  
> 

What is your GCC version? I don't have this build error.

Thanks,
Yuan



More information about the sheepdog mailing list