diff options
Diffstat (limited to 'src/kernel/core.c')
| -rw-r--r-- | src/kernel/core.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/kernel/core.c b/src/kernel/core.c index 2f7ddcb..6e9ce2b 100644 --- a/src/kernel/core.c +++ b/src/kernel/core.c @@ -132,13 +132,9 @@ static int dnbd3_ioctl(struct block_device *bdev, fmode_t mode, result = -EINVAL; } else { mutex_lock(&dev->device_lock); - if (sizeof(msg->host) != sizeof(dev->initial_server.host)) { + if (sizeof(msg->host) != sizeof(dnbd3_host_t)) { warn_dev(dev, "odd size bug#1 triggered in ioctl"); } - memcpy(&dev->initial_server.host, &msg->host, - sizeof(msg->host)); - dev->initial_server.failures = 0; - dnbd3_set_rtt_unknown(&dev->initial_server) dev->imgname = imgname; dev->rid = msg->rid; dev->use_server_provided_alts = @@ -149,8 +145,9 @@ static int dnbd3_ioctl(struct block_device *bdev, fmode_t mode, */ memset(dev->alt_servers, 0, sizeof(dev->alt_servers[0]) * NUMBER_SERVERS); - memcpy(dev->alt_servers, &dev->initial_server, - sizeof(dev->alt_servers[0])); + + memcpy(&dev->alt_servers[0].host, &msg->host, + sizeof(msg->host)); if (old_msg || msg->number_connections == 0) { dev->number_connections = 4; |