On 2021/05/24 23:41, Niklas Cassel wrote:
> From: Niklas Cassel <niklas.cassel@xxxxxxx>
>
> Ensure that we convert the max_open_zones option for client/server.
>
> Use __cpu_to_le32()/__le32_to_cpu() rather than
> cpu_to_le32()/le32_to_cpu(), since max_open_zones is defined
> as int rather than unsigned int in thread_options.h.
>
> Signed-off-by: Niklas Cassel <niklas.cassel@xxxxxxx>
> ---
> Changes since V1:
> - New patch.
>
> cconv.c | 2 ++
> server.h | 2 +-
> thread_options.h | 1 +
> 3 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/cconv.c b/cconv.c
> index aa06e3ea..d4dfb81b 100644
> --- a/cconv.c
> +++ b/cconv.c
> @@ -231,6 +231,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
> o->zone_capacity = le64_to_cpu(top->zone_capacity);
> o->zone_skip = le64_to_cpu(top->zone_skip);
> o->zone_mode = le32_to_cpu(top->zone_mode);
> + o->max_open_zones = __le32_to_cpu(top->max_open_zones);
> o->lockmem = le64_to_cpu(top->lockmem);
> o->offset_increment_percent = le32_to_cpu(top->offset_increment_percent);
> o->offset_increment = le64_to_cpu(top->offset_increment);
> @@ -573,6 +574,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
> top->zone_capacity = __cpu_to_le64(o->zone_capacity);
> top->zone_skip = __cpu_to_le64(o->zone_skip);
> top->zone_mode = __cpu_to_le32(o->zone_mode);
> + top->max_open_zones = __cpu_to_le32(o->max_open_zones);
> top->lockmem = __cpu_to_le64(o->lockmem);
> top->ddir_seq_add = __cpu_to_le64(o->ddir_seq_add);
> top->file_size_low = __cpu_to_le64(o->file_size_low);
> diff --git a/server.h b/server.h
> index b45b319b..8cf3a60b 100644
> --- a/server.h
> +++ b/server.h
> @@ -48,7 +48,7 @@ struct fio_net_cmd_reply {
> };
>
> enum {
> - FIO_SERVER_VER = 89,
> + FIO_SERVER_VER = 90,
>
> FIO_SERVER_MAX_FRAGMENT_PDU = 1024,
> FIO_SERVER_MAX_CMD_MB = 2048,
> diff --git a/thread_options.h b/thread_options.h
> index 5ecc72d7..4d48e462 100644
> --- a/thread_options.h
> +++ b/thread_options.h
> @@ -656,6 +656,7 @@ struct thread_options_pack {
> uint32_t allow_mounted_write;
>
> uint32_t zone_mode;
> + int32_t max_open_zones;
> } __attribute__((packed));
>
> extern void convert_thread_options_to_cpu(struct thread_options *o, struct thread_options_pack *top);
>
Looks good.
Reviewed-by: Damien Le Moal <damien.lemoal@xxxxxxx>
--
Damien Le Moal
Western Digital Research
