diff options
Diffstat (limited to 'src/kernel/net.c')
| -rw-r--r-- | src/kernel/net.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/kernel/net.c b/src/kernel/net.c index 801c15c..5f9846a 100644 --- a/src/kernel/net.c +++ b/src/kernel/net.c @@ -384,7 +384,7 @@ static void dnbd3_panic_worker(struct work_struct *work) mutex_lock(&dev->device_lock); if (dnbd3_adjust_connections(dev)) { error_dev(dev, "failed to connect to any server"); - dev->connected = false; +// dev->connected = false; } mutex_unlock(&dev->device_lock); @@ -584,7 +584,7 @@ static void dnbd3_discovery_worker(struct work_struct *work) mutex_lock(&dev->device_lock); if (dnbd3_adjust_connections(dev)) { error_dev(dev, "failed to connect to any server"); - dev->connected = false; +// dev->connected = false; } mutex_unlock(&dev->device_lock); @@ -836,14 +836,6 @@ int dnbd3_net_connect(struct dnbd3_device *dev) dev->timer.expires = jiffies + HZ; add_timer(&dev->timer); - // alt_server[0] is the initial server -// result = dnbd3_server_connect(dev, &dev->alt_servers[0]); -// if (result) { -// error_dev(dev, "failed to connect to initial server"); -// result = -ENOENT; -// dev->imgname = NULL; -// dev->socks[0].server = NULL; -// } return result; } @@ -860,6 +852,7 @@ int dnbd3_net_disconnect(struct dnbd3_device *dev) info_dev(dev, "not connected"); } + dev->connected = false; del_timer_sync(&dev->timer); /* be sure it does not recover while disconnecting */ cancel_work_sync(&dev->discovery_worker); @@ -876,7 +869,6 @@ int dnbd3_net_disconnect(struct dnbd3_device *dev) } kfree(dev->socks); dev->socks = NULL; - dev->connected = false; return result; } |