Skip to content

Commit

Permalink
Use unsigned int type for exit_what and stonewall
Browse files Browse the repository at this point in the history
Fixes: 64402a8 ("Expand choices for exitall")
Fixes: axboe#1065
Signed-off-by: André Wild <wild.andre.ae@gmail.com>
  • Loading branch information
XeS0r committed Aug 14, 2020
1 parent 5c79c32 commit b05a315
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions cconv.c
Expand Up @@ -237,8 +237,8 @@ void convert_thread_options_to_cpu(struct thread_options *o,
o->loops = le32_to_cpu(top->loops);
o->mem_type = le32_to_cpu(top->mem_type);
o->mem_align = le32_to_cpu(top->mem_align);
o->exit_what = le16_to_cpu(top->exit_what);
o->stonewall = le16_to_cpu(top->stonewall);
o->exit_what = le32_to_cpu(top->exit_what);
o->stonewall = le32_to_cpu(top->stonewall);
o->new_group = le32_to_cpu(top->new_group);
o->numjobs = le32_to_cpu(top->numjobs);
o->cpus_allowed_policy = le32_to_cpu(top->cpus_allowed_policy);
Expand Down Expand Up @@ -437,8 +437,8 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
top->loops = cpu_to_le32(o->loops);
top->mem_type = cpu_to_le32(o->mem_type);
top->mem_align = cpu_to_le32(o->mem_align);
top->exit_what = cpu_to_le16(o->exit_what);
top->stonewall = cpu_to_le16(o->stonewall);
top->exit_what = cpu_to_le32(o->exit_what);
top->stonewall = cpu_to_le32(o->stonewall);
top->new_group = cpu_to_le32(o->new_group);
top->numjobs = cpu_to_le32(o->numjobs);
top->cpus_allowed_policy = cpu_to_le32(o->cpus_allowed_policy);
Expand Down
2 changes: 1 addition & 1 deletion server.h
Expand Up @@ -48,7 +48,7 @@ struct fio_net_cmd_reply {
};

enum {
FIO_SERVER_VER = 83,
FIO_SERVER_VER = 84,

FIO_SERVER_MAX_FRAGMENT_PDU = 1024,
FIO_SERVER_MAX_CMD_MB = 2048,
Expand Down
4 changes: 2 additions & 2 deletions thread_options.h
Expand Up @@ -202,8 +202,8 @@ struct thread_options {

unsigned long long max_latency;

unsigned short exit_what;
unsigned short stonewall;
unsigned int exit_what;
unsigned int stonewall;
unsigned int new_group;
unsigned int numjobs;
os_cpu_mask_t cpumask;
Expand Down

0 comments on commit b05a315

Please sign in to comment.