diff options
Diffstat (limited to 'src/kernel/net.c')
| -rw-r--r-- | src/kernel/net.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kernel/net.c b/src/kernel/net.c index 5d3e344..7df8369 100644 --- a/src/kernel/net.c +++ b/src/kernel/net.c @@ -51,8 +51,8 @@ static DECLARE_WAIT_QUEUE_HEAD(send_wq); static uint64_t send_wq_handle; -static int dnbd3_socket_connect(dnbd3_device *dev, dnbd3_server *server); -static int dnbd3_socket_disconnect(dnbd3_device *dev, dnbd3_server *server, dnbd3_sock *sock); +static int dnbd3_socket_connect(struct dnbd3_device *dev, struct dnbd3_server *server); +static int dnbd3_socket_disconnect(struct dnbd3_device *dev, struct dnbd3_server *server, struct dnbd3_sock *sock); static void dnbd3_print_host(struct dnbd3_host_t *host, char *msg) { @@ -449,7 +449,7 @@ static void dnbd3_discovery_timer(struct timer_list *arg) static void dnbd3_discovery_worker(struct work_struct *work) { struct dnbd3_device *dev = container_of(work, struct dnbd3_device, discovery); - dnbd3_sock *sock = &dev->socks[0]; // we use the first sock for discovery + struct dnbd3_sock *sock = &dev->socks[0]; // we use the first sock for discovery int i, j; struct dnbd3_server *existing_server, *free_server, *failed_server; dnbd3_server_entry_t *new_server; @@ -574,7 +574,7 @@ error: return result; } -static int dnbd3_socket_connect(dnbd3_device *dev, dnbd3_server *server) +static int dnbd3_socket_connect(struct dnbd3_device *dev, struct dnbd3_server *server) { int i; int result = -EIO; @@ -675,10 +675,10 @@ static int dnbd3_socket_disconnect(struct dnbd3_device *dev, struct dnbd3_server */ if (sock->sock) { kernel_sock_shutdown(sock->sock, SHUT_RDWR); + sock->server = NULL; } mutex_unlock(&sock->lock); mutex_destroy(&sock->lock); - sock->server = NULL; printk(KERN_DEBUG "dnbd3: cancel receiver work device %i\n", dev->minor); cancel_work_sync(&sock->receive); |