From b9c11caeb31d1066979b8554f565f24abfe475f6 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 23 Mar 2021 16:00:55 +0100 Subject: [KERNEL] Synchronous add/remove of alt-servers via IOCTL --- src/kernel/dnbd3_main.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/kernel/dnbd3_main.h') diff --git a/src/kernel/dnbd3_main.h b/src/kernel/dnbd3_main.h index c5b0930..a69d588 100644 --- a/src/kernel/dnbd3_main.h +++ b/src/kernel/dnbd3_main.h @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -53,14 +54,13 @@ typedef struct { struct kobject kobj; // network + struct mutex alt_servers_lock; char *imgname; struct socket *sock; dnbd3_server_t cur_server; unsigned long cur_rtt; serialized_buffer_t payload_buffer; - dnbd3_server_t alt_servers[NUMBER_SERVERS]; // array of alt servers - int new_servers_num; // number of new alt servers that are waiting to be copied to above array - dnbd3_server_entry_t new_servers[NUMBER_SERVERS]; // pending new alt servers + dnbd3_server_t alt_servers[NUMBER_SERVERS]; // array of alt servers, protected by altservers_lock uint8_t discover, panic, update_available, panic_count; atomic_t connection_lock; uint8_t use_server_provided_alts; @@ -85,7 +85,11 @@ typedef struct { extern inline struct device *dnbd3_device_to_dev(dnbd3_device_t *dev); extern inline int is_same_server(const dnbd3_server_t *const a, const dnbd3_server_t *const b); -extern inline dnbd3_server_t *get_existing_server(const dnbd3_server_entry_t *const newserver, - dnbd3_device_t *const dev); + +extern dnbd3_server_t *get_existing_server(const dnbd3_host_t *const newserver, dnbd3_device_t *const dev); + +extern int dnbd3_add_server(dnbd3_device_t *dev, dnbd3_host_t *host); + +extern int dnbd3_rem_server(dnbd3_device_t *dev, dnbd3_host_t *host); #endif /* DNBD_H_ */ -- cgit v1.2.3-55-g7522