summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Rettberg2021-04-16 21:41:21 +0200
committerSimon Rettberg2021-04-16 21:41:21 +0200
commite2d13b1efdd6d02036404c1246282a739319eda6 (patch)
tree55106026ba5329ebe5e0f995e8421cd2b15fd1ba /src
parent[KERNEL] Fix Linter errors (diff)
downloaddnbd3-e2d13b1efdd6d02036404c1246282a739319eda6.tar.gz
dnbd3-e2d13b1efdd6d02036404c1246282a739319eda6.tar.xz
dnbd3-e2d13b1efdd6d02036404c1246282a739319eda6.zip
[KERNEL] Clean alt-server list first when connecting
When establishing a new connection on a disconnected device, the old list of alt-servers was retained. This would lead to us connecting to the wrong server, as the number of newly passed servers was used when looping over the list of alt-servers to actually connect.
Diffstat (limited to 'src')
-rw-r--r--src/kernel/blk.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/kernel/blk.c b/src/kernel/blk.c
index e501ec4..21c49a8 100644
--- a/src/kernel/blk.c
+++ b/src/kernel/blk.c
@@ -122,13 +122,15 @@ static int dnbd3_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int
blk_queue->backing_dev_info->ra_pages = (msg->read_ahead_kb * 1024) / PAGE_SIZE;
/* add specified servers to alt server list */
+ for (i = 0; i < NUMBER_SERVERS; i++)
+ dev->alt_servers[i].host.ss_family = 0;
for (i = 0; i < msg->hosts_num; i++) {
/* copy provided host into corresponding alt server slot */
if (dnbd3_add_server(dev, &msg->hosts[i]) == 0)
dev_dbg(dnbd3_device_to_dev(dev), "adding server %pISpc\n",
&dev->alt_servers[i].host);
else
- dev_warn(dnbd3_device_to_dev(dev), "could not add alt server %pISpc\n",
+ dev_warn(dnbd3_device_to_dev(dev), "could not add server %pISpc\n",
&dev->alt_servers[i].host);
}
@@ -136,21 +138,16 @@ static int dnbd3_blk_ioctl(struct block_device *bdev, fmode_t mode, unsigned int
* probe added alt servers in specified order and
* choose first working server as initial server
*/
- for (i = 0; i < msg->hosts_num; i++) {
+ result = -EPROTONOSUPPORT;
+ for (i = 0; i < NUMBER_SERVERS; i++) {
/* probe added alt server */
if (dev->alt_servers[i].host.ss_family == 0)
continue; // Empty slot
dev->cur_server.host = dev->alt_servers[i].host;
- if (dnbd3_net_connect(dev) != 0) {
- /*
- * probing server failed, cleanup connection and
- * proceed with next specified server
- */
- dnbd3_net_disconnect(dev);
- result = -ENOENT;
- } else {
- /* probing server succeeds, abort probing of other servers */
+ result = dnbd3_net_connect(dev);
+ if (result == 0) {
+ /* connection established, store index of server and exit loop */
result = i;
break;
}