server: convert buffer pattern settings across client/server

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/cconv.c b/cconv.c
index 3a6880ac1c59db1416095e357fc5b71f1b9bbb4b..3f41ae46c0bda6fc1474f65a2e02204dbe189fae 100644 (file)
--- a/cconv.c
+++ b/cconv.c
@@ -107,6 +107,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->verify_offset = le32_to_cpu(top->verify_offset);
 
        memcpy(o->verify_pattern, top->verify_pattern, MAX_PATTERN_SIZE);
+       memcpy(o->buffer_pattern, top->buffer_pattern, MAX_PATTERN_SIZE);
 
        o->verify_pattern_bytes = le32_to_cpu(top->verify_pattern_bytes);
        o->verify_fatal = le32_to_cpu(top->verify_fatal);
@@ -174,6 +175,7 @@ void convert_thread_options_to_cpu(struct thread_options *o,
        o->zero_buffers = le32_to_cpu(top->zero_buffers);
        o->refill_buffers = le32_to_cpu(top->refill_buffers);
        o->scramble_buffers = le32_to_cpu(top->scramble_buffers);
+       o->buffer_pattern_bytes = le32_to_cpu(top->buffer_pattern_bytes);
        o->time_based = le32_to_cpu(top->time_based);
        o->disable_lat = le32_to_cpu(top->disable_lat);
        o->disable_clat = le32_to_cpu(top->disable_clat);
@@ -327,6 +329,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        top->zero_buffers = cpu_to_le32(o->zero_buffers);
        top->refill_buffers = cpu_to_le32(o->refill_buffers);
        top->scramble_buffers = cpu_to_le32(o->scramble_buffers);
+       top->buffer_pattern_bytes = cpu_to_le32(o->buffer_pattern_bytes);
        top->time_based = cpu_to_le32(o->time_based);
        top->disable_lat = cpu_to_le32(o->disable_lat);
        top->disable_clat = cpu_to_le32(o->disable_clat);
@@ -389,6 +392,7 @@ void convert_thread_options_to_net(struct thread_options_pack *top,
        }
 
        memcpy(top->verify_pattern, o->verify_pattern, MAX_PATTERN_SIZE);
+       memcpy(top->buffer_pattern, o->buffer_pattern, MAX_PATTERN_SIZE);
 
        top->size = __cpu_to_le64(o->size);
        top->verify_backlog = __cpu_to_le64(o->verify_backlog);

diff --git a/server.h b/server.h
index 0416fd7d7d5be75f6d0fc734e79140c8d109285f..57e15d72ff1829c8f18d992e84f525168618d4ac 100644 (file)
--- a/server.h
+++ b/server.h
@@ -38,7 +38,7 @@ struct fio_net_cmd_reply {
 };
 
 enum {
-       FIO_SERVER_VER                  = 29,
+       FIO_SERVER_VER                  = 30,
 
        FIO_SERVER_MAX_FRAGMENT_PDU     = 1024,